From 6e7db38de7cfc905413e27cc8967909727db3022 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Wed, 27 Jul 2011 12:49:15 -0700 Subject: [PATCH] Use shell variable to eliminate $(eval) in commands. $(eval) in the commands does not evaulate in the same order in emake as in gmake. Using shell vars work in both makes. Change-Id: I4e95adb2bc6f4600e29b9a8524275a099f47a401 --- core/definitions.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/definitions.mk b/core/definitions.mk index 4c499ad84..9bbc93902 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1584,10 +1584,9 @@ endef define add-dex-to-package $(if $(filter classes.dex,$(notdir $(PRIVATE_DEX_FILE))),\ $(hide) $(AAPT) add -k $@ $(PRIVATE_DEX_FILE),\ -$(eval _adtp_classes.dex := $(dir $(PRIVATE_DEX_FILE))/classes.dex)\ -$(hide) cp $(PRIVATE_DEX_FILE) $(_adtp_classes.dex) && \ -$(AAPT) add -k $@ $(_adtp_classes.dex) && \ -rm -f $(_adtp_classes.dex)) +$(hide) _adtp_classes_dex=$(dir $(PRIVATE_DEX_FILE))classes.dex; \ +cp $(PRIVATE_DEX_FILE) $$_adtp_classes_dex && \ +$(AAPT) add -k $@ $$_adtp_classes_dex && rm -f $$_adtp_classes_dex) endef define add-java-resources-to-package