diff options
| author | Calin Juravle <calin@google.com> | 2017-08-02 17:19:27 -0700 |
|---|---|---|
| committer | Calin Juravle <calin@google.com> | 2017-08-02 17:19:27 -0700 |
| commit | 965f8aec4c70804ae1eb59bdf2de83d349463a66 (patch) | |
| tree | 89edd32f28ab0ba3382eb939f5e0da4eb7a84ad6 | |
| parent | 6ce5a428ae928a8f908daef37697794fcd1ce26d (diff) | |
| download | build-965f8aec4c70804ae1eb59bdf2de83d349463a66.tar.gz | |
Replace -classpath with --class-loader-context for preopt
Use --class-loader-context to pass the context to dex2oat instead of using
runtime arguments.
In preparation to simplify dex2oat handling of contexts.
Bug: 38138251
Test: make & check that the prebuilds have '&' as their classpath key
Change-Id: Iad2fc4364173f59f41886556222ec69f87a0bd52
| -rw-r--r-- | core/dex_preopt_libart.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk index 47fdba610d..0f2bb866b1 100644 --- a/core/dex_preopt_libart.mk +++ b/core/dex_preopt_libart.mk @@ -11,9 +11,9 @@ else DEX2OAT := $(HOST_OUT_EXECUTABLES)/dex2oatd$(HOST_EXECUTABLE_SUFFIX) 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. -DEX2OAT_CLASSPATH := "&" +DEX2OAT_CLASS_LOADER_CONTEXT := "&" DEX2OAT_DEPENDENCY += $(DEX2OAT) @@ -146,7 +146,7 @@ $(hide) rm -f $(2) $(hide) mkdir -p $(dir $(2)) $(hide) ANDROID_LOG_TAGS="*:e" $(DEX2OAT) \ --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) \ --dex-file=$(1) \ --dex-location=$(PRIVATE_DEX_LOCATION) \ |