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

Commit 1465806f authored by Colin Cross's avatar Colin Cross
Browse files

Fix incorrect renderscript zip deps 

Fix some incorrect dependencies after I12d33e52019aebac6ea33271939228e4690a4173.

Bug: 73885582
Test: m java FORCE_AAPT2=true
Change-Id: Ica2758991603e1605f629d843d19df5e2ef4fae1
parent d443244f

core/aapt2.mk

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ endif 
ifneq ($(my_generated_res_zips),)

my_zipped_resources_flata := $(my_compiled_res_base_dir)/zip_res.flata

$(my_zipped_resources_flata): PRIVATE_SOURCE_RES_ZIPS := $(my_generated_res_zips)

$(my_zipped_resources_flata) : $(my_generated_res_deps) $(AAPT2) $(ZIPSYNC)

$(my_zipped_resources_flata) : $(my_generated_res_zips) $(AAPT2) $(ZIPSYNC)

	@echo "AAPT2 compile $@ <- $(PRIVATE_SOURCE_RES_ZIPS)"

	$(call aapt2-compile-resource-zips)

core/package_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ else # LOCAL_USE_AAPT2 
    $(resource_export_package): PRIVATE_PRODUCT_AAPT_CONFIG :=

    $(resource_export_package): PRIVATE_PRODUCT_AAPT_PREF_CONFIG :=

    $(resource_export_package): PRIVATE_RESOURCE_LIST := $(all_res_assets)

    $(resource_export_package): $(all_res_assets) $(full_android_manifest) $(RenderScript_file_stamp) $(AAPT)

    $(resource_export_package): $(all_res_assets) $(full_android_manifest) $(rs_generated_res_zip) $(AAPT)

	@echo "target Export Resources: $(PRIVATE_MODULE) ($@)"

	$(create-empty-package)

	$(add-assets-to-package)