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

Commit 47e46f77 authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Make sure R.stamp is always created"

parents c82b873b fb6985e4

core/package_internal.mk

+5 −2
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ $(R_file_stamp): PRIVATE_RESOURCE_PUBLICS_OUTPUT := \ 
$(R_file_stamp): PRIVATE_PROGUARD_OPTIONS_FILE := $(proguard_options_file)

$(R_file_stamp): $(all_res_assets) $(full_android_manifest) $(RenderScript_file_stamp) $(AAPT) | $(ACP)

	@echo "target R.java/Manifest.java: $(PRIVATE_MODULE) ($@)"

	@rm -f $@

	@rm -rf $@ && mkdir -p $(dir $@)

	$(create-resource-java-files)

	$(hide) for GENERATED_MANIFEST_FILE in `find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) \

					-name Manifest.java 2> /dev/null`; do \
@@ -256,7 +256,10 @@ $(R_file_stamp): $(all_res_assets) $(full_android_manifest) $(RenderScript_file_ 
		$(ACP) -fp $$GENERATED_R_FILE $(TARGET_COMMON_OUT_ROOT)/R/$$dir \

			|| exit 31; \

		$(ACP) -fp $$GENERATED_R_FILE $@ || exit 32; \

	done; \

	done;

	@# Ensure that the target file is always created, i.e. also in case we did not

	@# enter the GENERATED_R_FILE-loop above. This avoids unnecessary rebuilding.

	$(hide) touch $@



$(proguard_options_file): $(R_file_stamp)