Update android_tools to 0.30.0
PiperOrigin-RevId: 573823647
Change-Id: Ia0b5f521c5d329f33fd6fa780d79b87340c0d019
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
index c79ecd8..d895d0d 100644
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
@@ -2101,7 +2101,7 @@
"moduleExtensions": {
"//:extensions.bzl%bazel_android_deps": {
"general": {
- "bzlTransitiveDigest": "jdNRQLdgdzth7seZmxLo3qJAjKVRYvhLuzWcBVCKuuE=",
+ "bzlTransitiveDigest": "yseV59Gli/QtNiWYztGw/BCEfbZOAJ97MKMy8mbTpbg=",
"accumulatedFileDigests": {},
"envVariables": {},
"generatedRepoSpecs": {
@@ -2126,7 +2126,7 @@
},
"//:extensions.bzl%bazel_build_deps": {
"general": {
- "bzlTransitiveDigest": "jdNRQLdgdzth7seZmxLo3qJAjKVRYvhLuzWcBVCKuuE=",
+ "bzlTransitiveDigest": "yseV59Gli/QtNiWYztGw/BCEfbZOAJ97MKMy8mbTpbg=",
"accumulatedFileDigests": {
"@@//src/test/tools/bzlmod:MODULE.bazel.lock": "e08da247a1b4200186a5118fcb0de3b1a39e8a402446607abfaaf420e543936f"
},
@@ -2342,7 +2342,7 @@
},
"//:extensions.bzl%bazel_test_deps": {
"general": {
- "bzlTransitiveDigest": "jdNRQLdgdzth7seZmxLo3qJAjKVRYvhLuzWcBVCKuuE=",
+ "bzlTransitiveDigest": "yseV59Gli/QtNiWYztGw/BCEfbZOAJ97MKMy8mbTpbg=",
"accumulatedFileDigests": {},
"envVariables": {},
"generatedRepoSpecs": {
@@ -2399,7 +2399,7 @@
},
"//tools/android:android_extensions.bzl%remote_android_tools_extensions": {
"general": {
- "bzlTransitiveDigest": "Bqnxx7EBkbAIa1pbi6x15Qa5SYY15EM6TspcYmS51S8=",
+ "bzlTransitiveDigest": "ibouvQjJ5aiSzhyc5x57J4CnvIbuwhFJ/zMpCeHpq0c=",
"accumulatedFileDigests": {},
"envVariables": {},
"generatedRepoSpecs": {
@@ -2408,8 +2408,8 @@
"ruleClassName": "http_archive",
"attributes": {
"name": "_main~remote_android_tools_extensions~android_tools",
- "sha256": "d7223664ca5b0de490f2a918c31f35cdf4f23a1446fe261d7470b8a22bd7bcf1",
- "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.29.0.tar"
+ "sha256": "2b661a761a735b41c41b3a78089f4fc1982626c76ddb944604ae3ff8c545d3c2",
+ "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.30.0.tar"
}
},
"android_gmaven_r8": {
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_remote_tools.WORKSPACE b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_remote_tools.WORKSPACE
index 29d6c05..822f857 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_remote_tools.WORKSPACE
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_remote_tools.WORKSPACE
@@ -5,8 +5,8 @@
maybe(
http_archive,
name = "android_tools",
- sha256 = "d7223664ca5b0de490f2a918c31f35cdf4f23a1446fe261d7470b8a22bd7bcf1", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER
- url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.29.0.tar",
+ sha256 = "2b661a761a735b41c41b3a78089f4fc1982626c76ddb944604ae3ff8c545d3c2", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER
+ url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.30.0.tar",
)
# This must be kept in sync with the top-level WORKSPACE file.
diff --git a/src/test/tools/bzlmod/MODULE.bazel.lock b/src/test/tools/bzlmod/MODULE.bazel.lock
index 1a65116..fb6c605 100644
--- a/src/test/tools/bzlmod/MODULE.bazel.lock
+++ b/src/test/tools/bzlmod/MODULE.bazel.lock
@@ -645,7 +645,7 @@
},
"@bazel_tools//tools/android:android_extensions.bzl%remote_android_tools_extensions": {
"general": {
- "bzlTransitiveDigest": "Bqnxx7EBkbAIa1pbi6x15Qa5SYY15EM6TspcYmS51S8=",
+ "bzlTransitiveDigest": "ibouvQjJ5aiSzhyc5x57J4CnvIbuwhFJ/zMpCeHpq0c=",
"accumulatedFileDigests": {},
"envVariables": {},
"generatedRepoSpecs": {
@@ -654,8 +654,8 @@
"ruleClassName": "http_archive",
"attributes": {
"name": "bazel_tools~remote_android_tools_extensions~android_tools",
- "sha256": "d7223664ca5b0de490f2a918c31f35cdf4f23a1446fe261d7470b8a22bd7bcf1",
- "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.29.0.tar"
+ "sha256": "2b661a761a735b41c41b3a78089f4fc1982626c76ddb944604ae3ff8c545d3c2",
+ "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.30.0.tar"
}
},
"android_gmaven_r8": {
diff --git a/third_party/googleapis/MODULE.bazel b/third_party/googleapis/MODULE.bazel
deleted file mode 100644
index d623e12..0000000
--- a/third_party/googleapis/MODULE.bazel
+++ /dev/null
@@ -1,11 +0,0 @@
-module(
- name = "googleapis",
- version = "",
-)
-
-bazel_dep(name = "rules_license", version = "0.0.3")
-bazel_dep(name = "rules_java", version = "4.0.0")
-bazel_dep(name = "rules_proto", version = "4.0.0")
-bazel_dep(name = "protobuf", version = "3.19.0", repo_name = "com_google_protobuf")
-
-bazel_dep(name = "bazel", version = "", repo_name = "io_bazel")
diff --git a/third_party/remoteapis/MODULE.bazel b/third_party/remoteapis/MODULE.bazel
deleted file mode 100644
index c67b338..0000000
--- a/third_party/remoteapis/MODULE.bazel
+++ /dev/null
@@ -1,11 +0,0 @@
-module(
- name = "remoteapis",
- version = "",
-)
-
-bazel_dep(name = "rules_java", version = "4.0.0")
-bazel_dep(name = "rules_proto", version = "4.0.0")
-bazel_dep(name = "protobuf", version = "3.19.0", repo_name = "com_google_protobuf")
-
-bazel_dep(name = "googleapis", version = "")
-bazel_dep(name = "bazel", version = "", repo_name = "io_bazel")
diff --git a/tools/android/android_extensions.bzl b/tools/android/android_extensions.bzl
index f34c569..ba65268 100644
--- a/tools/android/android_extensions.bzl
+++ b/tools/android/android_extensions.bzl
@@ -19,8 +19,8 @@
def _remote_android_tools_extensions_impl(_ctx):
http_archive(
name = "android_tools",
- sha256 = "d7223664ca5b0de490f2a918c31f35cdf4f23a1446fe261d7470b8a22bd7bcf1", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER
- url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.29.0.tar",
+ sha256 = "2b661a761a735b41c41b3a78089f4fc1982626c76ddb944604ae3ff8c545d3c2", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER
+ url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.30.0.tar",
)
http_jar(
name = "android_gmaven_r8",
