Merge "Revert "Remove org.apache.http.legacy from Settings""

2021-01-06 06:06:47 +00:00
parent 6c018a509f e69d1a650f
commit 5ccae0635d
3 changed files with 3 additions and 0 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -82,6 +82,7 @@ android_app {
        "settings-platform-compat-config",
    ],
    static_libs: ["Settings-core"],
+    uses_libs: ["org.apache.http.legacy"],
    resource_dirs: [],
    optimize: {
        proguard_flags_files: ["proguard.flags"],
--- 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"
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -49,6 +49,7 @@ android_app {
        "telephony-common",
        "ims-common",
    ],
+    uses_libs: ["org.apache.http.legacy"],
 }

 //############################################################