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

Commit b8338be5 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

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

am: c29cf6ef

Change-Id: I678611486f3f7c2951a02722224d3bbabae49e8b
parents 4d085387 c29cf6ef

core/post_clean.mk

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