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

Merge "Don't build automatic RROs for tests" am: 4d4ffb28f4

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

Change-Id: I8498d7585e61ac82da96a2c9f7dc75758f714438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-18 07:43:14 +00:00
committed by Automerger Merge Worker
parent b0845d7c4d 4d4ffb28f4
commit f18046a759
2 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/package_internal.mk
View File

@@ -111,7 +111,8 @@ include $(BUILD_SYSTEM)/support_libraries.mk
# Determine whether auto-RRO is enabled for this package.
enforce_rro_enabled :=
ifneq (,$(filter *, $(PRODUCT_ENFORCE_RRO_TARGETS)))
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.
# Note that base_rules.mk has not yet been included, so it's likely that only
@@ -127,8 +128,9 @@ ifneq (,$(filter *, $(PRODUCT_ENFORCE_RRO_TARGETS)))
else ifneq ($(filter $(TARGET_OUT)/%,$(LOCAL_MODULE_PATH)),)
enforce_rro_enabled := true
endif
else ifneq (,$(filter $(LOCAL_PACKAGE_NAME), $(PRODUCT_ENFORCE_RRO_TARGETS)))
else ifneq (,$(filter $(LOCAL_PACKAGE_NAME), $(PRODUCT_ENFORCE_RRO_TARGETS)))
enforce_rro_enabled := true
endif
endif
product_package_overlays := $(strip \

8
core/soong_app_prebuilt.mk
View File

@@ -239,7 +239,8 @@ my_common := COMMON
include $(BUILD_SYSTEM)/link_type.mk
endif # !LOCAL_IS_HOST_MODULE
ifdef LOCAL_SOONG_DEVICE_RRO_DIRS
ifeq (,$(filter tests,$(LOCAL_MODULE_TAGS)))
ifdef LOCAL_SOONG_DEVICE_RRO_DIRS
$(call append_enforce_rro_sources, \
$(my_register_name), \
false, \
@@ -248,9 +249,9 @@ ifdef LOCAL_SOONG_DEVICE_RRO_DIRS
$(LOCAL_SOONG_DEVICE_RRO_DIRS), \
vendor \
)
endif
endif
ifdef LOCAL_SOONG_PRODUCT_RRO_DIRS
ifdef LOCAL_SOONG_PRODUCT_RRO_DIRS
$(call append_enforce_rro_sources, \
$(my_register_name), \
false, \
@@ -259,6 +260,7 @@ ifdef LOCAL_SOONG_PRODUCT_RRO_DIRS
$(LOCAL_SOONG_PRODUCT_RRO_DIRS), \
product \
)
endif
endif
ifdef LOCAL_PREBUILT_COVERAGE_ARCHIVE