From 02013aeeb6926c4cb0b59ace60fe53fea9eaeaee Mon Sep 17 00:00:00 2001
From: Edgar Wang <edgarwang@google.com>
Date: Tue, 29 Dec 2020 14:45:14 +0800
Subject: [PATCH] Remove org.apache.http.legacy from Settings

It appears that all usages of org.apache.http were removed after aosp/118987.
Keeping this library in the phone settings manifest and build files adds an
unnecessary dependency for both phone settings

Bug: 176242377
Test: rebuild
Change-Id: I58eb077c2518c58b82e931596dfaefb151213c25
---
 Android.bp                 | 1 -
 AndroidManifest.xml        | 1 -
 tests/robotests/Android.bp | 1 -
 3 files changed, 3 deletions(-)

diff --git a/Android.bp b/Android.bp
index 5470e708143..c84dc1eb453 100644
--- a/Android.bp
+++ b/Android.bp
@@ -82,7 +82,6 @@ android_app {
         "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 c77680dd6f5..2e7453d6321 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -118,7 +118,6 @@
             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 c8c6c3840d1..421b57654c2 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -49,7 +49,6 @@ android_app {
         "telephony-common",
         "ims-common",
     ],
-    uses_libs: ["org.apache.http.legacy"],
 }
 
 //############################################################