Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e69d1a65 authored by Bonian Chen's avatar Bonian Chen
Browse files

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

This reverts commit 02013aee.

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
parent 02013aee

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -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"],

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -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"

tests/robotests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ android_app { 
        "telephony-common",

        "ims-common",

    ],

    uses_libs: ["org.apache.http.legacy"],

}



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