diff options
| author | Adnan Begovic <adnan@cyngn.com> | 2016-05-02 15:22:30 -0700 |
|---|---|---|
| committer | Adnan Begovic <adnan@cyngn.com> | 2016-05-02 15:24:30 -0700 |
| commit | b5332f95968d7115a46ade1f163528e5bdd31b9f (patch) | |
| tree | 3fd7f11225c24cf46fcacb0178147faf068e1b1a /core/static_java_library.mk | |
| parent | 1efc554af5a47172f98c729baaeb338d69536fcd (diff) | |
| download | build-b5332f95968d7115a46ade1f163528e5bdd31b9f.zip build-b5332f95968d7115a46ade1f163528e5bdd31b9f.tar.gz build-b5332f95968d7115a46ade1f163528e5bdd31b9f.tar.bz2 | |
build: Make sure to check for variable definition during execution.
TICKET: RM-232
Change-Id: Ic5b3850a81b959b05a218cd967dcec71c15a4cd5
Diffstat (limited to 'core/static_java_library.mk')
| -rw-r--r-- | core/static_java_library.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/static_java_library.mk b/core/static_java_library.mk index f4da963..5abb673 100644 --- a/core/static_java_library.mk +++ b/core/static_java_library.mk @@ -149,9 +149,9 @@ $(built_aar) : $(LOCAL_BUILT_MODULE) # Note: Use "cp -n" to honor the resource overlay rules, if multiple res dirs exist. $(hide) $(foreach res,$(PRIVATE_RESOURCE_DIR),cp -Rfn $(res)/* $(dir $@)aar/res;) $(hide) cp $(PRIVATE_R_TXT) $(dir $@)aar/R.txt -ifneq ($(PRIVATE_CONSUMER_PROGUARD_FILE),) - $(hide) cp $(PRIVATE_CONSUMER_PROGUARD_FILE) $(dir $@)aar/proguard.txt -endif + $(hide) if [ ! -z "$(PRIVATE_CONSUMER_PROGUARD_FILE)" ]; then \ + echo "Including '$(PRIVATE_CONSUMER_PROGUARD_FILE)'"; \ + $(hide) cp $(PRIVATE_CONSUMER_PROGUARD_FILE) $(dir $@)aar/proguard.txt; fi $(hide) jar -cMf $@ \ -C $(dir $@)aar . |