Fix language level 9 build.
Compilation for language level 9 requires java.lang on the module path
(~ the bootclasspath) or sourcepath; being on the classpath is not
enough.
This CL adds core-all-system-modules. Also, for consistency with several
other targets (e.g. external/conscrypt's conscrypt-benchmarks) as well
as with core-all-system-modules, the benchmarks target is changed to
depend on core-all rather than core-oj & core-libart.
Note that dependencies on core-all / core-all-system-modules should be
kept to a minimum. A future CL might introduce an alternative target
to depend on.
Fixes: 133764918
Test: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true make benchmarks
Change-Id: I5337118c183d6c7a1eab135c122528d4cb0974ef
diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index aec6e3d..4ce3629 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -156,6 +156,7 @@
"//external/conscrypt",
"//external/icu/android_icu4j",
"//external/okhttp",
+ "//libcore/benchmarks",
"//libcore/mmodules/intracoreapi",
],
defaults: ["libcore_java_defaults"],