diff options
| author | Ying Wang <wangying@android.com> | 2015-10-23 18:09:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-10-23 18:09:11 +0000 |
| commit | 47e46f77257e172c3603208587cce55c0a9fc28f (patch) | |
| tree | 8fa0e8fb3d2de54b625296365e31b79cfee857c8 | |
| parent | c82b873b9b6c234da128cdbc0dde6624e45f5b6d (diff) | |
| parent | fb6985e4dcef933856f47ad6012bddb18f0a06d8 (diff) | |
| download | build-47e46f77257e172c3603208587cce55c0a9fc28f.tar.gz | |
Merge "Make sure R.stamp is always created"
| -rw-r--r-- | core/package_internal.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/package_internal.mk b/core/package_internal.mk index 1f98cdc30a..a2cbe3192f 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -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) |