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

Commit a42ea23d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove pre-aidegen IDE support logic" am: 818e6c05 am: 55ac7fd6 

Original change: https://android-review.googlesource.com/c/platform/build/+/1764131

Change-Id: Ia69e9aac511ed9a40c28d453f3abf2bd0cb2c490
parents aabda241 55ac7fd6

CleanSpec.mk

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

# ************************************************

core/definitions.mk

+1 −12
Original line number Diff line number Diff line
@@ -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