Move android.compat.annotation package out of libcore
Test: m + flash
Bug: 142650523
Change-Id: I4c50bebb9fbfc3df89d948004c6c16dbb60ce8c7
diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index 8429ca6..1970354 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -208,6 +208,7 @@
":core_libart_java_files",
":openjdk_lambda_stub_files",
":openjdk_generated_annotation_stub_files",
+ ":app-compat-annotations-source",
],
sdk_version: "none",
@@ -498,12 +499,12 @@
"test-rules/src/platform_compat/**/*.java",
"luni/src/main/java/libcore/api/CorePlatformApi.java",
"luni/src/main/java/libcore/api/IntraCoreApi.java",
-
],
static_libs: [
"junit",
"guava",
"android-support-test",
+ "app-compat-annotations",
],
platform_apis: true,
// This builds classes that are in the java.base Java module: