From 51800d2a4bab1a32bc75250096c49230e49dcc79 Mon Sep 17 00:00:00 2001
From: Diego Vela <diegovela@google.com>
Date: Mon, 14 Dec 2020 22:05:04 +0000
Subject: [PATCH] Revert^2 "Add <uses-library> information."

6db09a0ad9188bb89d3e10cef2246d72e88e2560

Change-Id: I81b0a1228b73b9b4fc8116d1eb3134e5d04a76cd
---
 packages/CtsShim/build/Android.bp    | 3 +++
 packages/StatementService/Android.bp | 1 +
 2 files changed, 4 insertions(+)

diff --git a/packages/CtsShim/build/Android.bp b/packages/CtsShim/build/Android.bp
index 43e3868527130..14a3376380dfa 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 586292efa20b6..3831fd981c5c8 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",