diff options
| author | Ying Wang <wangying@google.com> | 2011-05-26 13:43:57 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2011-05-26 13:43:57 -0700 |
| commit | d90ff5e4c33ae020af1078f3b2c09b3a9fce514b (patch) | |
| tree | e1fbdfa5f6fce4f2997224c4038c421220a2ae85 /core/package.mk | |
| parent | bd08b7e415deddcc32a44e1e52b75a9d298706f1 (diff) | |
| download | build-d90ff5e4c33ae020af1078f3b2c09b3a9fce514b.zip build-d90ff5e4c33ae020af1078f3b2c09b3a9fce514b.tar.gz build-d90ff5e4c33ae020af1078f3b2c09b3a9fce514b.tar.bz2 | |
Fix possible unnecessary rebuild
This fix the unnecessary rebuild in the following scenario:
A package rename its manifest package name and the old R.java was still
in its intermediate dir. The rule to generate R_file_stamp may always
copy the old R.java with timestamp reserved and the R_file_stamp never
gets updated.
Change-Id: I659cbb00f0e7734d7d71e1ca66065f587c8dee2c
Diffstat (limited to 'core/package.mk')
| -rw-r--r-- | core/package.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/package.mk b/core/package.mk index adc542b..e79059a 100644 --- a/core/package.mk +++ b/core/package.mk @@ -199,15 +199,15 @@ $(R_file_stamp): $(all_res_assets) $(full_android_manifest) $(RenderScript_file_ -name Manifest.java 2> /dev/null`; do \ dir=`awk '/package/{gsub(/\./,"/",$$2);gsub(/;/,"",$$2);print $$2;exit}' $$GENERATED_MANIFEST_FILE`; \ mkdir -p $(TARGET_COMMON_OUT_ROOT)/R/$$dir; \ - $(ACP) -fpt $$GENERATED_MANIFEST_FILE $(TARGET_COMMON_OUT_ROOT)/R/$$dir; \ + $(ACP) -fp $$GENERATED_MANIFEST_FILE $(TARGET_COMMON_OUT_ROOT)/R/$$dir; \ done; $(hide) for GENERATED_R_FILE in `find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) \ -name R.java 2> /dev/null`; do \ dir=`awk '/package/{gsub(/\./,"/",$$2);gsub(/;/,"",$$2);print $$2;exit}' $$GENERATED_R_FILE`; \ mkdir -p $(TARGET_COMMON_OUT_ROOT)/R/$$dir; \ - $(ACP) -fpt $$GENERATED_R_FILE $(TARGET_COMMON_OUT_ROOT)/R/$$dir \ + $(ACP) -fp $$GENERATED_R_FILE $(TARGET_COMMON_OUT_ROOT)/R/$$dir \ || exit 31; \ - $(ACP) -fpt $$GENERATED_R_FILE $@ || exit 32; \ + $(ACP) -fp $$GENERATED_R_FILE $@ || exit 32; \ done; \ $(proguard_options_file): $(R_file_stamp) |