summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Diego Vela <diegovela@google.com> 2020-12-14 22:38:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-12-14 22:38:34 +0000
commit1e02d710bc6aa09c4c2d2d1e347ad5950f904534 (patch)
treef3b055f3cb8e4af49e5c37de9102a17091ddc4be
parent5b3715a1847a0834aef66b3a9711c56f6172dc44 (diff)
parent1f9067267a6421f0dd972118813a397feebf4599 (diff)
Merge "Revert^2 "Add <uses-library> information."" am: 6e35bf94ec am: 1f9067267a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1526686 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic44dcdcd401dd1afd9d31ba6bc5afb4d36cdb4de
-rw-r--r--packages/CtsShim/build/Android.bp3
-rw-r--r--packages/StatementService/Android.bp1
2 files changed, 4 insertions, 0 deletions
diff --git a/packages/CtsShim/build/Android.bp b/packages/CtsShim/build/Android.bp
index 43e386852713..14a3376380df 100644
--- a/packages/CtsShim/build/Android.bp
+++ b/packages/CtsShim/build/Android.bp
@@ -34,6 +34,8 @@ android_app {
compile_multilib: "both",
jni_libs: ["libshim_jni"],
+
+ uses_libs: ["android.test.runner"],
}
genrule {
@@ -108,6 +110,7 @@ android_app {
compile_multilib: "both",
jni_libs: ["libshim_jni"],
+ uses_libs: ["android.test.runner"],
}
//##########################################################
diff --git a/packages/StatementService/Android.bp b/packages/StatementService/Android.bp
index 586292efa20b..3831fd981c5c 100644
--- a/packages/StatementService/Android.bp
+++ b/packages/StatementService/Android.bp
@@ -20,6 +20,7 @@ android_app {
platform_apis: true,
privileged: true,
libs: ["org.apache.http.legacy"],
+ uses_libs: ["org.apache.http.legacy"],
static_libs: [
"libprotobuf-java-nano",
"volley",