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

Commit ab61f213 authored by Colin Cross's avatar Colin Cross
Browse files

Clear resource_export_package outside conditionals 

$(resource_export_package) is used by package_internal.mk outside
ifeq ($(need_compile_res),true), but only cleared inside the
conditional.  This causes unnecessary dependencies to be added
to an old value of $(resource_export_package).  In rare cases,
the dependency can be on itself, causing a dependency loop.

Bug: 71571462
Test: m checkbuild
Change-Id: I9fda7fe3bf9d208ad4ba2f8cdb184034bf43f044
parent d31ff8ff

core/package_internal.mk

+2 −1
Original line number Diff line number Diff line
@@ -363,6 +363,8 @@ $(foreach x,$(sharded_java_source_list_files),$(eval $(x): $(data_binding_stamp) 
$(full_classes_compiled_jar): $(data_binding_stamp)

endif  # LOCAL_DATA_BINDING



resource_export_package :=



ifeq ($(need_compile_res),true)



###############################
@@ -429,7 +431,6 @@ $(R_file_stamp): $(all_res_assets) $(full_android_manifest) $(RenderScript_file_ 


$(proguard_options_file): $(R_file_stamp)



resource_export_package :=

ifdef LOCAL_EXPORT_PACKAGE_RESOURCES

# Put this module's resources into a PRODUCT-agnositc package that

# other packages can use to build their own PRODUCT-agnostic R.java (etc.)