diff options
| author | Ying Wang <wangying@google.com> | 2011-07-27 12:49:15 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2011-07-27 12:57:37 -0700 |
| commit | 6e7db38de7cfc905413e27cc8967909727db3022 (patch) | |
| tree | 95cdeff411e70ded7c8f8fc409dc028ac5e0e9c1 /core | |
| parent | 7e99b231e0c0f98c3ba2a33c58f489326b0760dd (diff) | |
| download | build-6e7db38de7cfc905413e27cc8967909727db3022.zip build-6e7db38de7cfc905413e27cc8967909727db3022.tar.gz build-6e7db38de7cfc905413e27cc8967909727db3022.tar.bz2 | |
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
Diffstat (limited to 'core')
| -rw-r--r-- | core/definitions.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index 4c499ad..9bbc939 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 |