Restore system exit calls for ResourceProcessorBusyBox
Closes #10992.
PiperOrigin-RevId: 302025320
diff --git a/WORKSPACE b/WORKSPACE
index e886bed..cd0eb77 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -153,7 +153,7 @@
"c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz",
"1.25.0.zip",
"rules_nodejs-1.3.0.tar.gz",
- "android_tools_pkg-0.15.1.tar.gz",
+ "android_tools_pkg-0.16.0.tar.gz",
# bazelbuild/bazel-skylib
"2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz",
# bazelbuild/platforms
@@ -183,7 +183,7 @@
"1.25.0.zip": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647",
# rules_nodejs
"rules_nodejs-1.3.0.tar.gz": "b6670f9f43faa66e3009488bbd909bc7bc46a5a9661a33f6bc578068d1837f37",
- "android_tools_pkg-0.15.1.tar.gz": "6b9b9a88a700ae0cdeb75d787f55cab2e939e19af81345e68c9be34f733a2abb",
+ "android_tools_pkg-0.16.0.tar.gz": "e2cbd43a9d23aa32197c29d689a7e017f205acb07053f5dd584f500a1a9d4361",
# bazelbuild/bazel-skylib
"2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz": "c00ceec469dbcf7929972e3c79f20c14033824538038a554952f5c31d8832f96",
# bazelbuild/platforms
@@ -230,8 +230,8 @@
"https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/archive/rules_nodejs-1.3.0.tar.gz",
"https://github.com/bazelbuild/rules_nodejs/archive/rules_nodejs-1.3.0.tar.gz",
],
- "android_tools_pkg-0.15.1.tar.gz": [
- "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.15.1.tar.gz",
+ "android_tools_pkg-0.16.0.tar.gz": [
+ "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.16.0.tar.gz",
],
# bazelbuild/bazel-skylib
"2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz": [
@@ -482,7 +482,7 @@
"zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz",
"zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz",
"zulu11.37.17-ca-jdk11.0.6-win_x64.zip",
- "android_tools_pkg-0.15.1.tar.gz",
+ "android_tools_pkg-0.16.0.tar.gz",
# bazelbuild/bazel-skylib
"2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz",
# bazelbuild/platforms
@@ -506,7 +506,7 @@
"zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4",
"zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f",
"zulu11.37.17-ca-jdk11.0.6-win_x64.zip": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18",
- "android_tools_pkg-0.15.1.tar.gz": "6b9b9a88a700ae0cdeb75d787f55cab2e939e19af81345e68c9be34f733a2abb",
+ "android_tools_pkg-0.16.0.tar.gz": "e2cbd43a9d23aa32197c29d689a7e017f205acb07053f5dd584f500a1a9d4361",
# bazelbuild/bazel-skylib
"2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz": "c00ceec469dbcf7929972e3c79f20c14033824538038a554952f5c31d8832f96",
# bazelbuild/platforms
@@ -529,8 +529,8 @@
"zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz"],
"zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz"],
"zulu11.37.17-ca-jdk11.0.6-win_x64.zip": ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"],
- "android_tools_pkg-0.15.1.tar.gz": [
- "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.15.1.tar.gz",
+ "android_tools_pkg-0.16.0.tar.gz": [
+ "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.16.0.tar.gz",
],
# bazelbuild/bazel-skylib
"2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz": [
@@ -628,8 +628,8 @@
name = "android_tools_for_testing",
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
- sha256 = "6b9b9a88a700ae0cdeb75d787f55cab2e939e19af81345e68c9be34f733a2abb", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER
- url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.15.1.tar.gz",
+ sha256 = "e2cbd43a9d23aa32197c29d689a7e017f205acb07053f5dd584f500a1a9d4361", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER
+ url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.16.0.tar.gz",
)
# This must be kept in sync with src/main/java/com/google/devtools/build/lib/bazel/rules/coverage.WORKSPACE.
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 1dafdc6..0a37d01 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
@@ -3,6 +3,6 @@
# This must be kept in sync with the top-level WORKSPACE file.
http_archive(
name = "android_tools",
- sha256 = "6b9b9a88a700ae0cdeb75d787f55cab2e939e19af81345e68c9be34f733a2abb",
- url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.15.1.tar.gz",
+ sha256 = "e2cbd43a9d23aa32197c29d689a7e017f205acb07053f5dd584f500a1a9d4361",
+ url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.16.0.tar.gz",
)
diff --git a/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java b/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java
index e80a034..380a931 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java
@@ -170,13 +170,13 @@
// initialize Options/OptionsParser here. This keeps the processRequest interface minimal and
// minimizes moving option state between these methods.
if (args.length == 1 && args[0].equals("--persistent_worker")) {
- runPersistentWorker();
+ System.exit(runPersistentWorker());
} else {
- processRequest(Arrays.asList(args));
+ System.exit(processRequest(Arrays.asList(args)));
}
}
- private static void runPersistentWorker() throws Exception {
+ private static int runPersistentWorker() throws Exception {
while (true) {
try {
WorkRequest request = WorkRequest.parseDelimitedFrom(System.in);
@@ -194,8 +194,10 @@
} catch (IOException e) {
logger.severe(e.getMessage());
e.printStackTrace();
+ return 1;
}
}
+ return 0;
}
private static int processRequest(List<String> args) throws Exception {
diff --git a/tools/android/runtime_deps/upload_android_tools.sh b/tools/android/runtime_deps/upload_android_tools.sh
index caed260..f3366df 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.15.1"
+VERSION="0.16.0"
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.
@@ -59,7 +59,7 @@
cat <<EOF
sed -i 's/android_tools_pkg.*\.tar\.gz/$VERSIONED_FILENAME/g' WORKSPACE && \\
- sed -i 's/"[0-9a-fA-F]\{64\}", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER/"$checksum", # ANDROID_TOOLS_UPDATE_MARKER_DO_NOT_REMOVE/g' WORKSPACE && \\
+ sed -i 's/"[0-9a-fA-F]\{64\}", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER/"$checksum", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER/g' WORKSPACE && \\
sed -i 's/"android_tools_pkg.*[0-9a-FA-F]\{64\}",.*/"$VERSIONED_FILENAME": "$checksum",/g' WORKSPACE && \\
sed -i 's/android_tools_pkg.*\.tar\.gz/$VERSIONED_FILENAME/g' src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_remote_tools.WORKSPACE && \\
sed -i 's/"[0-9a-fA-F]\{64\}",.*/"$checksum",/g' src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_remote_tools.WORKSPACE
