Merge #556 by ted-xie: Update java extras jar The old include_prefixes list for the extras jar was copied from Bazel, which copied it from an uptstream project years ago. The list is now outdated and does not work for newer JDK versions. This change copies the list from a Google-internal upstream project. This obviates #555. Change-Id: Idab4efdb2e6c97acd504d79c4bd800be6acc86d7 Closes #556 COPYBARA_INTEGRATE_REVIEW=https://github.com/bazelbuild/rules_android/pull/556 from ted-xie:update-java-extras-jar ed344b1d86ab37394b7cfcf26f83d4c0f301b825 PiperOrigin-RevId: 974707380
diff --git a/tools/android/BUILD b/tools/android/BUILD index e9983ff..4aa929d 100644 --- a/tools/android/BUILD +++ b/tools/android/BUILD
@@ -387,8 +387,17 @@ ], out = "java_base_extras.jar", include_prefixes = [ - "java/lang/invoke/", - "java/lang/annotation/", + "java/lang/invoke/StringConcatFactory.class", + "java/lang/invoke/LambdaMetafactory.class", + "java/lang/invoke/SerializedLambda.class", + "java/lang/invoke/ConstantBootstraps.class", + "java/lang/runtime/SwitchBootstraps.class", + "java/lang/constant/*.class", + "java/lang/Enum*.class", + "java/lang/annotation/*", + "javax/lang/model/element/Modifier.class", + "sun/misc/Unsafe.class", + "java/nio/file/Files.class", ], visibility = ["//visibility:private"], )