diff options
| author | Ian Rogers <irogers@google.com> | 2014-04-18 15:23:40 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-04-18 15:23:40 -0700 |
| commit | 5d186aee8e4c24a831d5e257b45715c844a287a0 (patch) | |
| tree | 4934ad1839cf66f355bbf05898ede98c2a97dbf5 /core/dex_preopt_libart.mk | |
| parent | 63030fe60842d9385f75d5ecdd17aa11a67a4e05 (diff) | |
| download | build-5d186aee8e4c24a831d5e257b45715c844a287a0.zip build-5d186aee8e4c24a831d5e257b45715c844a287a0.tar.gz build-5d186aee8e4c24a831d5e257b45715c844a287a0.tar.bz2 | |
For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled.
Change-Id: Ia95d74517f8182031d6044ae55559010a98ec5ca
Diffstat (limited to 'core/dex_preopt_libart.mk')
| -rw-r--r-- | core/dex_preopt_libart.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk index 7809c13..73e8494 100644 --- a/core/dex_preopt_libart.mk +++ b/core/dex_preopt_libart.mk @@ -69,7 +69,8 @@ $(DEFAULT_DEX_PREOPT_BUILT_IMAGE): $(LIBART_TARGET_BOOT_DEX_FILES) $(DEX2OATD_DE --oat-file=$(patsubst %.art,%.oat,$@) \ --oat-location=$(patsubst %.art,%.oat,$(LIBART_BOOT_IMAGE)) \ --image=$@ --base=$(LIBART_IMG_TARGET_BASE_ADDRESS) \ - --instruction-set=$(TARGET_ARCH) --instruction-set-features=$(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \ + --instruction-set=$(DEX2OAT_TARGET_ARCH) \ + --instruction-set-features=$(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \ --android-root=$(PRODUCT_OUT)/system @@ -90,6 +91,6 @@ $(hide) $(DEX2OATD) \ --dex-location=$(3) \ --oat-file=$(4) \ --android-root=$(PRODUCT_OUT)/system \ - --instruction-set=$(TARGET_ARCH) \ + --instruction-set=$(DEX2OAT_TARGET_ARCH) \ --instruction-set-features=$(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) endef |