From 202ca49dfed5e410d0f85f8c77570df0a6163c54 Mon Sep 17 00:00:00 2001 From: Ulya Trafimovich Date: Mon, 7 Sep 2020 14:45:16 +0100 Subject: [PATCH] Add information. The required "org.apache.http.legacy" is in the manifest for Settings. It is necessary to explicitly add it to `uses_libs` because it is not among the app dependencies (so Soong does not add it automatically to the manifest_fixer). It also doesn't add it as a compatibility library because the target API level for the app is not below 28. Bug: 132357300 Test: lunch cf_x86_phone-userdebug && m Test: m out/soong/.intermediates/packages/apps/Settings/Settings/android_common/manifest_check/AndroidManifest.xml Test: m out/soong/.intermediates/packages/apps/Settings/tests/robotests/SettingsRoboTestStub/android_common/manifest_check/AndroidManifest.xm Change-Id: Id5d5fe1dff68cf6fce667a00e35710cf0e667d02 --- Android.bp | 1 + tests/robotests/Android.bp | 1 + 2 files changed, 2 insertions(+) diff --git a/Android.bp b/Android.bp index 8e075b6db90..03b4c36dd5b 100644 --- a/Android.bp +++ b/Android.bp @@ -81,6 +81,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"], diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp index 6b491e51aa9..d6c56be9fa3 100644 --- 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"], } //############################################################