p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 7f9a1a49cf)
This commit is contained in:
Jiyong Park 2018-05-15 21:44:04 +09:00
parent 2317cf5e6e
commit 565ec59f1f
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/dex_preopt_libart.mk
View File

@ -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))

10
core/setup_one_odex.mk
View File

@ -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

2
target/product/core_minimal.mk
View File

@ -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

2
target/product/core_tiny.mk
View File

@ -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