From 3c6bba0af08cff4ad6dc56edc04526247264532c Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 14 Dec 2016 19:53:54 -0800 Subject: [PATCH] Don't clean generated java sources when AIDL list changes AIDL doesn't generate into the intermediate src directory, we pass exact aidl->java files to the compiler. So there is no need to clean the intermediate src directory when the aidl file list changes for a module. Test: None, just code inspection Change-Id: I01feff7cc399ac5b88b83333a1ac86928d0a81e6 --- core/post_clean.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/post_clean.mk b/core/post_clean.mk index d7e83229b..553f7287f 100644 --- a/core/post_clean.mk +++ b/core/post_clean.mk @@ -17,7 +17,7 @@ ####################################################### # Check if we need to delete obsolete generated java files. -# When an aidl/proto/etc file gets deleted (or renamed), the generated java file is obsolete. +# When an proto/etc file gets deleted (or renamed), the generated java file is obsolete. previous_gen_java_config := $(TARGET_OUT_COMMON_INTERMEDIATES)/previous_gen_java_config.mk current_gen_java_config := $(TARGET_OUT_COMMON_INTERMEDIATES)/current_gen_java_config.mk @@ -29,8 +29,7 @@ $(shell rm -rf $(current_gen_java_config) \ intermediates_to_clean := modules_with_gen_java_files := $(foreach p, $(ALL_MODULES), \ - $(eval gs := $(strip $(ALL_MODULES.$(p).AIDL_FILES)\ - $(ALL_MODULES.$(p).PROTO_FILES)\ + $(eval gs := $(strip $(ALL_MODULES.$(p).PROTO_FILES)\ $(ALL_MODULES.$(p).RS_FILES)))\ $(if $(gs),\ $(eval modules_with_gen_java_files += $(p))\