diff options
| author | 2019-11-13 08:07:42 -0800 | |
|---|---|---|
| committer | 2019-11-13 08:07:42 -0800 | |
| commit | 8e8c40b5c262cc8fb88c44953547fecf58e495b0 (patch) | |
| tree | 9086519331943685c952ecbd40f6ab3b2690c963 | |
| parent | b2803b2350990eb2d72f4acc2c873412eaa475b4 (diff) | |
| parent | 22d585ee0209455177f1a2f8f5fa088c86bff7d0 (diff) | |
Merge "Move android.compat.annotation package out of libcore" am: b4852382fa
am: 22d585ee02
Change-Id: I9780a459aafe811b7ca2fbb839f4682278426d02
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | services/core/Android.bp | 1 | ||||
| -rw-r--r-- | services/devicepolicy/Android.bp | 1 | ||||
| -rw-r--r-- | test-mock/Android.bp | 5 |
4 files changed, 10 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index 46c12fe91d1b..891ee91f7ed9 100644 --- a/Android.bp +++ b/Android.bp @@ -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", ], diff --git a/services/core/Android.bp b/services/core/Android.bp index ed68f32036e5..a05c2cc31e40 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -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: [ diff --git a/services/devicepolicy/Android.bp b/services/devicepolicy/Android.bp index 47790ce68dc1..dbe0d811dbb6 100644 --- a/services/devicepolicy/Android.bp +++ b/services/devicepolicy/Android.bp @@ -4,5 +4,6 @@ java_library_static { libs: [ "services.core", + "app-compat-annotations", ], } diff --git a/test-mock/Android.bp b/test-mock/Android.bp index 0b5d4460612d..aa4174ad40f4 100644 --- a/test-mock/Android.bp +++ b/test-mock/Android.bp @@ -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", |