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

Commit 5ccae063 authored by Bonian Chen's avatar Bonian Chen Committed by Android (Google) Code Review
Browse files

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

parents 6c018a50 e69d1a65

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"],

}



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