tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "rearrange app-related artifact path in make" am: 73d29f11b8 am: 28ecb7a712 am: 5c63493c1a

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2554553

Change-Id: Ie9861e6a979af1bf3e3edc4f6af7c17001acdba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-04-24 19:35:32 +00:00 committed by Automerger Merge Worker
commit b2730fbf36
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/generate_enforce_rro.mk
View file

@ -1,6 +1,6 @@
include $(CLEAR_VARS) include $(CLEAR_VARS)
enforce_rro_module := $(enforce_rro_source_module)__auto_generated_rro_$(enforce_rro_partition) enforce_rro_module := $(enforce_rro_source_module)__$(PRODUCT_NAME)__auto_generated_rro_$(enforce_rro_partition)
LOCAL_PACKAGE_NAME := $(enforce_rro_module) LOCAL_PACKAGE_NAME := $(enforce_rro_module)
intermediates := $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),,COMMON) intermediates := $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),,COMMON)

6
core/package_internal.mk
View file

@ -201,10 +201,10 @@ my_res_resources := $(if $(my_res_dir),$(strip \
all_resources := $(strip $(my_res_resources) $(my_overlay_resources)) all_resources := $(strip $(my_res_resources) $(my_overlay_resources))
# The linked resource package. # The linked resource package.
my_res_package := $(intermediates)/package-res.apk my_res_package := $(intermediates.COMMON)/package-res.apk
LOCAL_INTERMEDIATE_TARGETS += $(my_res_package) LOCAL_INTERMEDIATE_TARGETS += $(my_res_package)
my_bundle_module := $(intermediates)/base.zip my_bundle_module := $(intermediates.COMMON)/base.zip
LOCAL_INTERMEDIATE_TARGETS += $(my_bundle_module) LOCAL_INTERMEDIATE_TARGETS += $(my_bundle_module)
# Always run aapt2, because we need to at least compile the AndroidManifest.xml. # Always run aapt2, because we need to at least compile the AndroidManifest.xml.
@ -570,7 +570,7 @@ ifdef LOCAL_COMPRESSED_MODULE
$(compress-package) $(compress-package)
endif # LOCAL_COMPRESSED_MODULE endif # LOCAL_COMPRESSED_MODULE
my_package_res_pb := $(intermediates)/package-res.pb.apk my_package_res_pb := $(intermediates.COMMON)/package-res.pb.apk
$(my_package_res_pb): $(my_res_package) $(AAPT2) $(my_package_res_pb): $(my_res_package) $(AAPT2)
$(AAPT2) convert --output-format proto $< -o $@ $(AAPT2) convert --output-format proto $< -o $@