commit d89452976b6d476896747a0136a1ad40e514e162
author Ying Wang <wangying@google.com> Tue Oct 11 10:11:44 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 11 10:11:44 2011 -0700
tree 89d15664844282658f775da9cf94dc624883b99b
parent 861348a4be2355e49f090271d7410fa850d5c7f8
parent 6e7db38de7cfc905413e27cc8967909727db3022

Merge "Use shell variable to eliminate $(eval) in commands."

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 1afc0f4..99682fd 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1585,10 +1585,9 @@
 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