Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b8ec884 authored by Adnan Begovic's avatar Adnan Begovic
Browse files

build: Make sure to check for variable definition during execution. 

TICKET: RM-232
Change-Id: Ic5b3850a81b959b05a218cd967dcec71c15a4cd5
(cherry picked from commit b5332f95)
parent 2be5c076

core/static_java_library.mk

+3 −3
Original line number Diff line number Diff line
@@ -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 .