diff options
| -rw-r--r-- | CleanSpec.mk | 3 | ||||
| -rw-r--r-- | core/definitions.mk | 13 |
2 files changed, 4 insertions, 12 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 3beadff9b0..e96735b051 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -757,6 +757,9 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/soong/host/*/lib*/libconscrypt_openjdk_ # vendor-ramdisk renamed to vendor_ramdisk $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor-ramdisk) +# Common R directory has been removed. +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/R) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/definitions.mk b/core/definitions.mk index 102827bb3a..10c2a5fbed 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1928,21 +1928,10 @@ endef # b/37750224 AAPT_ASAN_OPTIONS := ASAN_OPTIONS=detect_leaks=0 -# Search for generated R.java/Manifest.java in $1, copy the found R.java as $2. -# Also copy them to a central 'R' directory to make it easier to add the files to an IDE. +# Search for generated R.java in $1, copy the found R.java as $2. define find-generated-R.java -$(hide) for GENERATED_MANIFEST_FILE in `find $(1) \ - -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; \ - cp $$GENERATED_MANIFEST_FILE $(TARGET_COMMON_OUT_ROOT)/R/$$dir; \ - done; $(hide) for GENERATED_R_FILE in `find $(1) \ -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; \ - cp $$GENERATED_R_FILE $(TARGET_COMMON_OUT_ROOT)/R/$$dir \ - || exit 31; \ cp $$GENERATED_R_FILE $(2) || exit 32; \ done; @# Ensure that the target file is always created, i.e. also in case we did not |