From 2317cf5e6eee6a20430044f361c94a4d96aaafbd Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Wed, 2 May 2018 15:29:56 +0900 Subject: [PATCH 1/2] use the phony module name to install org.apache.http.legacy org.apache.http.legacy.boot which is the runtime library for org.apache.http.legacy API is now renamed to org.apache.http.legacy.impl as a result of migration to java_sdk_library. Installing the runtime library can now be done via the sdk lib name (org.apache.http.legacy) which internally includes the .impl runtime lib. Bug: 77577799 Test: m -j Test: device boots to the UI. No error related to org.apache.http.legacy shown in the logcat log. Test: adb shell cmd package list libraries | grep http shows the library. Merged-In: I224bc0f8c58958240130aa7874851ecfdf6f7317 Change-Id: I224bc0f8c58958240130aa7874851ecfdf6f7317 (cherry picked from commit 6ac30d5270f12bbba33d02d3eebbbd407f06d170) --- target/product/base.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/product/base.mk b/target/product/base.mk index d6507c61f..74514afff 100644 --- a/target/product/base.mk +++ b/target/product/base.mk @@ -18,7 +18,7 @@ PRODUCT_PACKAGES += \ 20-dns.conf \ 95-configured \ - org.apache.http.legacy.boot \ + org.apache.http.legacy \ appwidget \ appops \ am \ From 565ec59f1f405842b19a3f07425f00eb861c26bb Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Tue, 15 May 2018 21:44:04 +0900 Subject: [PATCH 2/2] org.apache.http.legacy.boot is renamed to org.apache.http.legacy.impl The name of the runtime library name for the SDK library org.apache.http.legacy has changed to org.apache.http.legacy.impl as it is now built using java_sdk_library construct where *.impl suffix is automatically added to the runtime lib. Bug: 77577799 Test: m -j Merged-In: Ie049d06d78cc403454c2885def88a167975b4204 Change-Id: Ie049d06d78cc403454c2885def88a167975b4204 (cherry picked from commit 7f9a1a49cf6741156c15e72db8255b55273bde86) --- core/dex_preopt_libart.mk | 2 +- core/setup_one_odex.mk | 10 +++++----- target/product/core_minimal.mk | 2 +- target/product/core_tiny.mk | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk index 3b9e4e132..64ad20020 100644 --- a/core/dex_preopt_libart.mk +++ b/core/dex_preopt_libart.mk @@ -165,7 +165,7 @@ my_2nd_arch_prefix := # $(2): the output .odex file # In the case where LOCAL_ENFORCE_USES_LIBRARIES is true, PRIVATE_DEX2OAT_CLASS_LOADER_CONTEXT # contains the normalized path list of the libraries. This makes it easier to conditionally prepend -# org.apache.http.legacy.boot based on the SDK level if required. +# org.apache.http.legacy.impl based on the SDK level if required. define dex2oat-one-file $(hide) rm -f $(2) $(hide) mkdir -p $(dir $(2)) diff --git a/core/setup_one_odex.mk b/core/setup_one_odex.mk index 907a37942..92f58b2c5 100644 --- a/core/setup_one_odex.mk +++ b/core/setup_one_odex.mk @@ -78,12 +78,12 @@ else my_stored_preopt_class_loader_context_libs := $(call normalize-path-list, \ $(foreach lib_name,$(my_filtered_uses_libraries),/system/framework/$(lib_name).jar)) - # Fix up org.apache.http.legacy.boot since it should be org.apache.http.legacy in the manifest. - my_lib_names := $(patsubst org.apache.http.legacy.boot,org.apache.http.legacy,$(my_lib_names)) - my_optional_lib_names := $(patsubst org.apache.http.legacy.boot,org.apache.http.legacy,$(my_optional_lib_names)) + # Fix up org.apache.http.legacy.impl since it should be org.apache.http.legacy in the manifest. + my_lib_names := $(patsubst org.apache.http.legacy.impl,org.apache.http.legacy,$(my_lib_names)) + my_optional_lib_names := $(patsubst org.apache.http.legacy.impl,org.apache.http.legacy,$(my_optional_lib_names)) ifeq (,$(filter org.apache.http.legacy,$(my_lib_names) $(my_optional_lib_names))) - my_conditional_uses_libraries_host := $(call intermediates-dir-for,JAVA_LIBRARIES,org.apache.http.legacy.boot,,COMMON)/javalib.jar - my_conditional_uses_libraries_target := /system/framework/org.apache.http.legacy.boot.jar + my_conditional_uses_libraries_host := $(call intermediates-dir-for,JAVA_LIBRARIES,org.apache.http.legacy.impl,,COMMON)/javalib.jar + my_conditional_uses_libraries_target := /system/framework/org.apache.http.legacy.impl.jar endif endif diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk index 16599cb95..87972481a 100644 --- a/target/product/core_minimal.mk +++ b/target/product/core_minimal.mk @@ -116,7 +116,7 @@ PRODUCT_BOOT_JARS := \ telephony-common \ voip-common \ ims-common \ - org.apache.http.legacy.boot \ + org.apache.http.legacy.impl \ android.hidl.base-V1.0-java \ android.hidl.manager-V1.0-java diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk index 122f5c780..c6bc72c6f 100644 --- a/target/product/core_tiny.mk +++ b/target/product/core_tiny.mk @@ -103,7 +103,7 @@ PRODUCT_BOOT_JARS := \ voip-common \ ims-common \ nullwebview \ - org.apache.http.legacy.boot \ + org.apache.http.legacy.impl \ android.hidl.base-V1.0-java \ android.hidl.manager-V1.0-java