commit 8403231bbb5327d4cab40e293eb9ace88449cb4c
author Diego Vela <diegovela@google.com> Mon Dec 14 22:24:05 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Dec 14 22:24:05 2020 +0000
tree 7a74ebb35320ad0007ea492d395b18521966cea4
parent 9d61c8a23d2b85f7cbb5912443104c816995ed65
parent a2e406ed85031e21f047c9aab724ac5b3b774a9f

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b27110024a7422343149b0eff00ed97bc726419

Android.bp

diff --git a/Android.bp b/Android.bp
index 8e075b6..03b4c36 100644
--- a/Android.bp
+++ b/Android.bp
@@ -81,6 +81,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 6b491e5..d6c56be 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"],
 }
 
 //############################################################