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

Commit 7f309d6e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes If012c943,Ica275899 into pi-dev 

* changes:
  Fix zipped resources
  Fix incorrect renderscript zip deps
parents 8b6eda5f bdaada85

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/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -2086,7 +2086,7 @@ endef 
define aapt2-compile-resource-zips

@mkdir -p $(dir $@)

$(ZIPSYNC) -d $@.contents -l $@.list $(PRIVATE_SOURCE_RES_ZIPS)

$(hide) $(AAPT2) compile -o $@ --dir $@.tmp $(PRIVATE_AAPT2_CFLAGS) --legacy

$(hide) $(AAPT2) compile -o $@ --dir $@.contents $(PRIVATE_AAPT2_CFLAGS) --legacy

endef



# Set up rule to compile one resource file with aapt2.

core/package_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,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)