openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Build: Do not treat org.apache.http.legacy.boot as boot classpath 

For compilation purposes, treat org.apache.http.legacy.boot as
a regular java library, so it gets standalone-preopted.

This is a workaround until the module is properly removed from
the boot classpath, at which point it should be reverted.

Bug: 18027885
Bug: 72167111
Test: m
Test: manual
Change-Id: Ifadcd1d1e754ce215b96369623ea154d3c3321eb
This commit is contained in:
Andreas Gampe 2018-01-19 10:56:23 -08:00
parent 12fcd769f7
commit 039bb48f72
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/dex_preopt_odex_install.mk
View File

@ -125,6 +125,12 @@ endif
ifdef LOCAL_DEX_PREOPT
dexpreopt_boot_jar_module := $(filter $(DEXPREOPT_BOOT_JARS_MODULES),$(LOCAL_MODULE))
# Filter org.apache.http.legacy.boot.
ifeq ($(dexpreopt_boot_jar_module),org.apache.http.legacy.boot)
dexpreopt_boot_jar_module :=
endif
ifdef dexpreopt_boot_jar_module
# For libart, the boot jars' odex files are replaced by $(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE).
# We use this installed_odex trick to get boot.art installed.