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

Merge "Replace -classpath with --class-loader-context for preopt"

This commit is contained in:
Calin Juravle 2017-08-03 20:57:38 +00:00 committed by Gerrit Code Review
parent 138c7baabe 965f8aec4c
commit 1a7b46bf71
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/dex_preopt_libart.mk
View File

@ -11,9 +11,9 @@ else
DEX2OAT := $(HOST_OUT_EXECUTABLES)/dex2oatd$(HOST_EXECUTABLE_SUFFIX) DEX2OAT := $(HOST_OUT_EXECUTABLES)/dex2oatd$(HOST_EXECUTABLE_SUFFIX)
endif endif
# Pass special classpath to skip uses library check. # Pass special class loader context to skip the classpath and collision check.
# Should modify build system to pass used libraries properly later. # Should modify build system to pass used libraries properly later.
DEX2OAT_CLASSPATH := "&" DEX2OAT_CLASS_LOADER_CONTEXT := "&"
DEX2OAT_DEPENDENCY += $(DEX2OAT) DEX2OAT_DEPENDENCY += $(DEX2OAT)
@ -146,7 +146,7 @@ $(hide) rm -f $(2)
$(hide) mkdir -p $(dir $(2)) $(hide) mkdir -p $(dir $(2))
$(hide) ANDROID_LOG_TAGS="*:e" $(DEX2OAT) \ $(hide) ANDROID_LOG_TAGS="*:e" $(DEX2OAT) \
--runtime-arg -Xms$(DEX2OAT_XMS) --runtime-arg -Xmx$(DEX2OAT_XMX) \ --runtime-arg -Xms$(DEX2OAT_XMS) --runtime-arg -Xmx$(DEX2OAT_XMX) \
--runtime-arg -classpath --runtime-arg $(DEX2OAT_CLASSPATH) \ --class-loader-context=$(DEX2OAT_CLASS_LOADER_CONTEXT) \
--boot-image=$(PRIVATE_DEX_PREOPT_IMAGE_LOCATION) \ --boot-image=$(PRIVATE_DEX_PREOPT_IMAGE_LOCATION) \
--dex-file=$(1) \ --dex-file=$(1) \
--dex-location=$(PRIVATE_DEX_LOCATION) \ --dex-location=$(PRIVATE_DEX_LOCATION) \