Move android.compat.annotation package out of libcore

Test: m + flash
Bug: 142650523
Change-Id: I1321195c8724485a90b162b32c3c8549dbd11c42
This commit is contained in:
atrost
2019-11-04 17:03:54 +00:00
parent 1a2b940646
commit 1a9455046c
4 changed files with 10 additions and 1 deletions

View File

@@ -418,6 +418,7 @@ java_library {
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 @@ java_library {
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 {
java_library {
name: "framework-atb-backward-compatibility",
installable: true,
libs: ["app-compat-annotations"],
srcs: [
"core/java/android/content/pm/AndroidTestBaseUpdater.java",
],

View File

@@ -31,6 +31,7 @@ java_library_static {
"android.hardware.light-V2.0-java",
"android.hardware.power-V1.0-java",
"android.hardware.tv.cec-V1.0-java",
"app-compat-annotations",
],
required: [

View File

@@ -4,5 +4,6 @@ java_library_static {
libs: [
"services.core",
"app-compat-annotations",
],
}

View File

@@ -27,7 +27,10 @@ java_sdk_library {
":framework-core-sources-for-test-mock",
":framework_native_aidl",
],
libs: ["framework-all"],
libs: [
"framework-all",
"app-compat-annotations",
],
api_packages: [
"android.test.mock",