diff options
| author | atrost <atrost@google.com> | 2019-11-13 17:21:20 +0000 |
|---|---|---|
| committer | atrost <atrost@google.com> | 2019-11-13 17:21:20 +0000 |
| commit | 56dea3a7ccfe67adea5da4c03ac05c550bef87df (patch) | |
| tree | b590b310f9fb85ce23060457cdc7a7c14bb2d714 | |
| parent | fce6ba29b48830099fe2d3213ef8de3f3b483961 (diff) | |
| parent | 8e8c40b5c262cc8fb88c44953547fecf58e495b0 (diff) | |
resolve merge conflicts of 8e8c40b5c262cc8fb88c44953547fecf58e495b0 to master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia3ee4dce9639f9b66a44828f28c1fa7cd645dfe5
| -rw-r--r-- | Android.bp | 3 | ||||
| -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, 9 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index 6e3799b74cd6..9ca815ddb00e 100644 --- a/Android.bp +++ b/Android.bp @@ -425,6 +425,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: [ @@ -463,6 +464,7 @@ java_library { defaults: ["framework-defaults"], srcs: [":framework-all-sources"], installable: false, + libs: ["app-compat-annotations"], plugins: [ "unsupportedappusage-annotation-processor", "compat-changeid-annotation-processor", @@ -502,6 +504,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 770de09382fe..c6bc1068da39 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -91,6 +91,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 91c05a858ce4..bffa44e868a7 100644 --- a/services/devicepolicy/Android.bp +++ b/services/devicepolicy/Android.bp @@ -4,6 +4,7 @@ java_library_static { libs: [ "services.core", + "app-compat-annotations", ], plugins: [ 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", |