Merge "Don't clean generated java sources when AIDL list changes"

am: e9c4079e91

Change-Id: I854de56628e16c12a771f18423274e5409ee374b
This commit is contained in:
Dan Willemsen 2016-12-15 07:13:05 +00:00 committed by android-build-merger
commit c29cf6efb6
1 changed files with 2 additions and 3 deletions

View File

@ -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))\