Revert "Remove org.apache.http.legacy from Settings"
This reverts commit 02013aeeb6926c4cb0b59ace60fe53fea9eaeaee.
Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master-without-vendor&target=aosp_arm64-eng&lkgb=7064184&lkbb=7064600&fkbb=7064600, bug 176865269
Change-Id: I49701fb6055b636598998463936b4251e118834a
BUG: 176865269
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"],
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2e7453d..c77680d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -118,6 +118,7 @@
android:directBootAware="true"
android:appComponentFactory="androidx.core.app.CoreComponentFactory">
+ <uses-library android:name="org.apache.http.legacy" />
<!-- Settings -->
<activity android:name=".homepage.SettingsHomepageActivity"
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"],
}
//############################################################