am b11697d3: am 68d38154: Merge "Remove host-prefix command line argument to dex2oat."

* commit 'b11697d30778db51d476aedd28b0e2c65eb241e3':
  Remove host-prefix command line argument to dex2oat.
This commit is contained in:
Nicolas Geoffray 2014-03-04 17:24:44 +00:00 committed by Android Git Automerger
commit 3f5cc08d46
1 changed files with 1 additions and 2 deletions

View File

@ -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)