StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't build automatic RROs for tests" into udc-dev am: d6286eefa8

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23288488

Change-Id: Ic0f314886148c7cbea9cf24d10d55430e10ff357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-17 23:18:19 +00:00
committed by Automerger Merge Worker
parent d714e3d18f d6286eefa8
commit 9412209acb
2 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/package_internal.mk
View File

@@ -111,6 +111,7 @@ include $(BUILD_SYSTEM)/support_libraries.mk
# Determine whether auto-RRO is enabled for this package.
enforce_rro_enabled :=
ifeq (,$(filter tests,$(LOCAL_MODULE_TAGS)))
ifneq (,$(filter *, $(PRODUCT_ENFORCE_RRO_TARGETS)))
# * means all system and system_ext APKs, so enable conditionally based on module path.
@@ -130,6 +131,7 @@ ifneq (,$(filter *, $(PRODUCT_ENFORCE_RRO_TARGETS)))
else ifneq (,$(filter $(LOCAL_PACKAGE_NAME), $(PRODUCT_ENFORCE_RRO_TARGETS)))
enforce_rro_enabled := true
endif
endif
product_package_overlays := $(strip \
$(wildcard $(foreach dir, $(PRODUCT_PACKAGE_OVERLAYS), \

2
core/soong_app_prebuilt.mk
View File

@@ -239,6 +239,7 @@ my_common := COMMON
include $(BUILD_SYSTEM)/link_type.mk
endif # !LOCAL_IS_HOST_MODULE
ifeq (,$(filter tests,$(LOCAL_MODULE_TAGS)))
ifdef LOCAL_SOONG_DEVICE_RRO_DIRS
$(call append_enforce_rro_sources, \
$(my_register_name), \
@@ -260,6 +261,7 @@ ifdef LOCAL_SOONG_PRODUCT_RRO_DIRS
product \
)
endif
endif
ifdef LOCAL_PREBUILT_COVERAGE_ARCHIVE
my_coverage_dir := $(TARGET_OUT_COVERAGE)/$(patsubst $(PRODUCT_OUT)/%,%,$(my_module_path))