commit 247dd0c4af33fc7d3ebcfc058837e131e5185546
author Nicolas Geoffray <ngeoffray@google.com> Wed Mar 05 14:09:26 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 05 14:09:26 2014 +0000
tree d592647cc56f76cbfbcd00c45bf624a4904272c5
parent 68d381540f822849f3bcd7620f773aa9ba004900
parent 3cb9ddbdec80117255b8e2861996c14cd3af7366

Merge "Do not remove the generated .hpp file from yacc."

core/dex_preopt_libart.mk

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