Fix package-split-across-modules issue in art.module.api.annotations.
This target builds dalvik.system.VersionCodes. Several dalvik.system
classes (DexFile and the various *ClassLoader classes) are in
java.base when sdk_version is core_current. The package is therefore
split across modules. This hasn't been a problem until now since
everything built with and sdk_version of core_current has implicitly
had a java_version of 1.8, but that needs to change (see
https://r.android.com/1145829).
This change explicitly opts this target into java_version 1.9, which
triggers the issue ahead of the Soong change, and then using
patch_module to fix the issue.
Bug: 142896162
Test: m art.module.api.annotations
Change-Id: I71abeded2f1c922f844b8a91c38b8819ca9f7285
diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index a9218db..501b2c5 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -917,5 +917,7 @@
srcs: [
":api_surface_annotation_files",
],
+ java_version: "1.9",
+ patch_module: "java.base",
sdk_version: "core_current",
}