Bump android-tools to 0.8
Closes #8873.
PiperOrigin-RevId: 257850193
diff --git a/WORKSPACE b/WORKSPACE
index 95cc34a2..8c7fff1 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -116,7 +116,7 @@
"1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz",
"8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz",
"0.16.2.zip",
- "android_tools_pkg-0.7.tar.gz",
+ "android_tools_pkg-0.8.tar.gz",
# bazelbuild/platforms
"441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip",
# bazelbuild/rules_java
@@ -137,7 +137,7 @@
"1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz": "3ca1b3d453a977aeda60dd335feb812771addfd0d0c61751b34b9681aa4d6534",
"8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898",
"0.16.2.zip": "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0",
- "android_tools_pkg-0.7.tar.gz": "a8e48f2fdee2c34b31f45bd47ce050a75ac774f19e0a1f6694fa49fc11d88718", # built at 6bb5ae2a8353d75867ac9136d374df7916450449
+ "android_tools_pkg-0.8.tar.gz": "a9eac6e1b27d5549edaaa724b20eb1cdae6253b84f44d5744c30372bd523cfcd", # built at 5dd956930fba6201a820f82a738dbb72f6cfab52
# bazelbuild/platforms
"441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip": "a07fe5e75964361885db725039c2ba673f0ee0313d971ae4f50c9b18cd28b0b5",
# bazelbuild/rules_java
@@ -180,8 +180,8 @@
"https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip",
"https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip",
],
- "android_tools_pkg-0.7.tar.gz": [
- "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.7.tar.gz",
+ "android_tools_pkg-0.8.tar.gz": [
+ "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.8.tar.gz",
],
# bazelbuild/platforms
"441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip": [
@@ -460,7 +460,7 @@
"zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz",
"zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip",
"zulu11.29.3-ca-jdk11.0.2-win_x64.zip",
- "android_tools_pkg-0.7.tar.gz",
+ "android_tools_pkg-0.8.tar.gz",
# bazelbuild/platforms
"441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip",
# bazelbuild/rules_java
@@ -489,7 +489,7 @@
"zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz": "f3f44b6235508e87b760bf37a49e186cc1fa4e9cd28384c4dbf5a33991921e08",
"zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip": "059f8e3484bf07b63a8f2820d5f528f473eff1befdb1896ee4f8ff06be3b8d8f",
"zulu11.29.3-ca-jdk11.0.2-win_x64.zip": "e1f5b4ce1b9148140fae2fcfb8a96d1c9b7eac5b8df0e13fbcad9b8561284880",
- "android_tools_pkg-0.7.tar.gz": "a8e48f2fdee2c34b31f45bd47ce050a75ac774f19e0a1f6694fa49fc11d88718", # built at 6bb5ae2a8353d75867ac9136d374df7916450449
+ "android_tools_pkg-0.8.tar.gz": "a9eac6e1b27d5549edaaa724b20eb1cdae6253b84f44d5744c30372bd523cfcd", # built at 5dd956930fba6201a820f82a738dbb72f6cfab52
# bazelbuild/platforms
"441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip": "a07fe5e75964361885db725039c2ba673f0ee0313d971ae4f50c9b18cd28b0b5",
# bazelbuild/rules_java
@@ -517,8 +517,8 @@
"zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz"],
"zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip": ["https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip"],
"zulu11.29.3-ca-jdk11.0.2-win_x64.zip": ["https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64.zip"],
- "android_tools_pkg-0.7.tar.gz": [
- "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.7.tar.gz",
+ "android_tools_pkg-0.8.tar.gz": [
+ "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.8.tar.gz",
],
# bazelbuild/platforms
"441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip": [
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 df101f3..f3026e6 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
@@ -2,7 +2,7 @@
http_archive(
name = "android_tools",
- url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.7.tar.gz",
- sha256 = "a8e48f2fdee2c34b31f45bd47ce050a75ac774f19e0a1f6694fa49fc11d88718", # built at 6bb5ae2a8353d75867ac9136d374df7916450449
+ url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.8.tar.gz",
+ sha256 = "a9eac6e1b27d5549edaaa724b20eb1cdae6253b84f44d5744c30372bd523cfcd", # built at 5dd956930fba6201a820f82a738dbb72f6cfab52
)
diff --git a/tools/android/runtime_deps/upload_android_tools.sh b/tools/android/runtime_deps/upload_android_tools.sh
index 0ff634d..7b7446a 100755
--- a/tools/android/runtime_deps/upload_android_tools.sh
+++ b/tools/android/runtime_deps/upload_android_tools.sh
@@ -31,7 +31,7 @@
set -euo pipefail
# The version of android_tools.tar.gz
-VERSION="0.7"
+VERSION="0.8"
VERSIONED_FILENAME="android_tools_pkg-$VERSION.tar.gz"
# Create a temp directory to hold the versioned tarball, and clean it up when the script exits.
@@ -52,8 +52,7 @@
gs://bazel-mirror/bazel_android_tools/$VERSIONED_FILENAME
checksum=$(sha256sum $versioned_android_tools_archive | cut -f 1 -d ' ')
-
-commit=$(git rev-parse HEAD)
+commit=$(cd $BUILD_WORKSPACE_DIRECTORY && git rev-parse HEAD)
echo
echo "Run this command to update Bazel to use the new version:"
