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 /test-mock | |
| 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
Diffstat (limited to 'test-mock')
| -rw-r--r-- | test-mock/Android.bp | 5 |
1 files changed, 4 insertions, 1 deletions
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", |