commit afdf5ed0d46d210755f5f385052a3a4959dccdd2
author Diego Vela <diegovela@google.com> Mon Dec 14 22:56:14 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Dec 14 22:56:14 2020 +0000
tree 3290865252d7ec04adfdde61282e795ef7e5a474
parent ed5986c33556e8367734f19bcf06bb53623859ab
parent 25ee8c7cf01fbc585699322f9839904961e80743

Merge "Revert^2 "Add <uses-library> information."" am: a2e406ed85 am: 8403231bbb am: 25ee8c7cf0

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6db438a43e58f0ee0df43c12cb1db69ed1ae218d

Android.bp

diff --git a/Android.bp b/Android.bp
index c84dc1e..5470e70 100644
--- a/Android.bp
+++ b/Android.bp
@@ -82,6 +82,7 @@
         "settings-platform-compat-config",
     ],
     static_libs: ["Settings-core"],
+    uses_libs: ["org.apache.http.legacy"],
     resource_dirs: [],
     optimize: {
         proguard_flags_files: ["proguard.flags"],

tests/robotests/Android.bp

diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index 421b576..c8c6c38 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -49,6 +49,7 @@
         "telephony-common",
         "ims-common",
     ],
+    uses_libs: ["org.apache.http.legacy"],
 }
 
 //############################################################