From 6db09a0ad9188bb89d3e10cef2246d72e88e2560 Mon Sep 17 00:00:00 2001
From: Diego Vela <diegovela@google.com>
Date: Mon, 14 Dec 2020 21:14:24 +0000
Subject: [PATCH] Revert "Add <uses-library> information."

Revert "Add <uses-library> information."

Revert "Add <uses-library> information."

Revert submission 1427961-uses-libs-23

Reason for revert: Broken build
Bug: 175607244
Reverted Changes:
I6ab699005:Add <uses-library> information.
Id5d5fe1df:Add <uses-library> information.
Id12741c9b:Add <uses-library> information.
I2fe6e09c2:Add <uses-library> information.

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

diff --git a/packages/CtsShim/build/Android.bp b/packages/CtsShim/build/Android.bp
index 14a3376380dfa..43e3868527130 100644
--- a/packages/CtsShim/build/Android.bp
+++ b/packages/CtsShim/build/Android.bp
@@ -34,8 +34,6 @@ android_app {
 
     compile_multilib: "both",
     jni_libs: ["libshim_jni"],
-
-    uses_libs: ["android.test.runner"],
 }
 
 genrule {
@@ -110,7 +108,6 @@ 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 3831fd981c5c8..586292efa20b6 100644
--- a/packages/StatementService/Android.bp
+++ b/packages/StatementService/Android.bp
@@ -20,7 +20,6 @@ android_app {
     platform_apis: true,
     privileged: true,
     libs: ["org.apache.http.legacy"],
-    uses_libs: ["org.apache.http.legacy"],
     static_libs: [
         "libprotobuf-java-nano",
         "volley",