diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-03-04 17:20:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-04 17:20:36 +0000 |
| commit | 68d381540f822849f3bcd7620f773aa9ba004900 (patch) | |
| tree | 8cd2d59d42844220ea089dcca1f4264dcb75daf2 | |
| parent | 6808c2608f0eff3275110154d7267f934700c167 (diff) | |
| parent | 5fd9a32c4f9952adf35b4263a910b53c0da54ac0 (diff) | |
| download | build-68d381540f822849f3bcd7620f773aa9ba004900.zip build-68d381540f822849f3bcd7620f773aa9ba004900.tar.gz build-68d381540f822849f3bcd7620f773aa9ba004900.tar.bz2 | |
Merge "Remove host-prefix command line argument to dex2oat."
| -rw-r--r-- | core/dex_preopt_libart.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk index fa2b7e3..70ffee9 100644 --- a/core/dex_preopt_libart.mk +++ b/core/dex_preopt_libart.mk @@ -74,7 +74,7 @@ $(DEFAULT_DEX_PREOPT_BUILT_IMAGE): $(LIBART_TARGET_BOOT_DEX_FILES) $(DEX2OAT_DEP --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) \ - --host-prefix=$(DEXPREOPT_PRODUCT_DIR_FULL_PATH) --android-root=$(PRODUCT_OUT)/system + --android-root=$(PRODUCT_OUT)/system ######################################################################## @@ -93,7 +93,6 @@ $(hide) $(DEX2OAT) \ --dex-file=$(2) \ --dex-location=$(3) \ --oat-file=$(4) \ - --host-prefix=$(DEXPREOPT_PRODUCT_DIR_FULL_PATH) \ --android-root=$(PRODUCT_OUT)/system \ --instruction-set=$(TARGET_ARCH) \ --instruction-set-features=$(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) |