From e1b8e964d8937f917401bfe781ffa4c73a32e0d7 Mon Sep 17 00:00:00 2001 From: azad Date: Sun, 31 May 2026 22:25:38 +0000 Subject: [PATCH 1/2] [Android] Fix stray closing braces in StrictJavaDepsPlugin Remove two extra closing braces that cause a syntax error during the java_tools bootstrap build (unexpected token: void). Co-Authored-By: Claude Opus 4.6 (1M context) --- .../buildjar/javac/plugins/dependency/StrictJavaDepsPlugin.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/StrictJavaDepsPlugin.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/StrictJavaDepsPlugin.java index b0e1fe0992356a..e56e80191f9946 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/StrictJavaDepsPlugin.java +++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/StrictJavaDepsPlugin.java @@ -355,8 +355,6 @@ private static ByteString hashFile(FileObject fileObject) { throw new RuntimeException("Failure to compute hash for " + fileObject, ex); } } - } - } /** * Marks the provided dependency as a direct/explicit dependency. Additionally, if From 0eafd2e8f20611a9f224f737c8732fbf4d329f92 Mon Sep 17 00:00:00 2001 From: azad Date: Sun, 31 May 2026 22:27:48 +0000 Subject: [PATCH 2/2] [Android] Remove desugar_jdk_libs.jar from android_tools tar The desugar_jdk_libs.jar target no longer exists in the Bazel 8 tree, causing the android_tools bootstrap build to fail. Co-Authored-By: Claude Opus 4.6 (1M context) --- tools/android/runtime_deps/BUILD.bazel | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/android/runtime_deps/BUILD.bazel b/tools/android/runtime_deps/BUILD.bazel index f95bca5a1882cd..d98ef58e73e1b3 100644 --- a/tools/android/runtime_deps/BUILD.bazel +++ b/tools/android/runtime_deps/BUILD.bazel @@ -82,7 +82,6 @@ pkg_tar( srcs = [ "BUILD", "WORKSPACE", - ":desugar_jdk_libs.jar", ":version.txt", "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker_deploy.jar", ],