Build core-all using i18n module intra core api
Requires some additional entries to be added to the i18n intra core
api.
Remove core-libart-oj.depscheck as it is no longer required because
core-all builds against the i18n intra core api now.
Bug: 141683101
Test: m checkbuild
Change-Id: I04215b461f1c69773371253bc9a45b29ae28ad0d
diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index 217915e..800e0dc 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -192,7 +192,10 @@
defaults: ["libcore_java_defaults"],
srcs: [
- ":android_icu4j_src_files",
+ // Use the source code for the I18N module intra core API as using the
+ // compiled version does not work due to limitations in either soong or the javac
+ // toolchain. See http://b/142056316 for more details.
+ ":i18n-module-intra-core-api-stubs-source",
":core_oj_java_files",
":core_libart_java_files",
":openjdk_lambda_stub_files",