commit 1a9455046cbda76d11ac69f92def93b6532f1113
author atrost <atrost@google.com> Mon Nov 04 17:03:54 2019 +0000
committer atrost <atrost@google.com> Mon Nov 11 15:10:57 2019 +0000
tree 9e02e49289ef1307e4461b99c964735a6a336b3c
parent 1a2b94064622d5c4333a065781b781868afa2d35

Move android.compat.annotation package out of libcore

Test: m + flash
Bug: 142650523
Change-Id: I1321195c8724485a90b162b32c3c8549dbd11c42

Android.bp

diff --git a/Android.bp b/Android.bp
index 284e701..61afe2a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -418,6 +418,7 @@
     name: "framework-minus-apex",
     defaults: ["framework-defaults"],
     srcs: [":framework-non-updatable-sources"],
+    libs: ["app-compat-annotations"],
     installable: true,
     javac_shard_size: 150,
     required: [
@@ -454,12 +455,14 @@
     defaults: ["framework-defaults"],
     srcs: [":framework-all-sources"],
     installable: false,
+    libs: ["app-compat-annotations"],
 }
 
 java_library {
     name: "framework-annotation-proc",
     defaults: ["framework-defaults"],
     srcs: [":framework-all-sources"],
+    libs: ["app-compat-annotations"],
     installable: false,
     plugins: [
         "unsupportedappusage-annotation-processor",
@@ -500,6 +503,7 @@
 java_library {
     name: "framework-atb-backward-compatibility",
     installable: true,
+    libs: ["app-compat-annotations"],
     srcs: [
         "core/java/android/content/pm/AndroidTestBaseUpdater.java",
     ],