PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bonian Chen
2021-01-06 06:06:47 +00:00
committed by Android (Google) Code Review
parent 6c018a509f e69d1a650f
commit 5ccae0635d
3 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -82,6 +82,7 @@ android_app {
"settings-platform-compat-config", "settings-platform-compat-config",
], ],
static_libs: ["Settings-core"], static_libs: ["Settings-core"],
uses_libs: ["org.apache.http.legacy"],
resource_dirs: [], resource_dirs: [],
optimize: { optimize: {
proguard_flags_files: ["proguard.flags"], proguard_flags_files: ["proguard.flags"],

1
AndroidManifest.xml
View File

@@ -118,6 +118,7 @@
android:directBootAware="true" android:directBootAware="true"
android:appComponentFactory="androidx.core.app.CoreComponentFactory"> android:appComponentFactory="androidx.core.app.CoreComponentFactory">
<uses-library android:name="org.apache.http.legacy" />
<!-- Settings --> <!-- Settings -->
<activity android:name=".homepage.SettingsHomepageActivity" <activity android:name=".homepage.SettingsHomepageActivity"

1
tests/robotests/Android.bp
View File

@@ -49,6 +49,7 @@ android_app {
"telephony-common", "telephony-common",
"ims-common", "ims-common",
], ],
uses_libs: ["org.apache.http.legacy"],
} }
//############################################################ //############################################################