Revert "Remove org.apache.http.legacy from Settings"
This reverts commit 02013aeeb6
.
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
This commit is contained in:
@@ -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"],
|
||||||
|
@@ -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"
|
||||||
|
@@ -49,6 +49,7 @@ android_app {
|
|||||||
"telephony-common",
|
"telephony-common",
|
||||||
"ims-common",
|
"ims-common",
|
||||||
],
|
],
|
||||||
|
uses_libs: ["org.apache.http.legacy"],
|
||||||
}
|
}
|
||||||
|
|
||||||
//############################################################
|
//############################################################
|
||||||
|
Reference in New Issue
Block a user