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

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-17 22:01:57 +00:00
committed by Android (Google) Code Review
parent 6c8f896589 2e55115ab3
commit d6286eefa8
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. # Determine whether auto-RRO is enabled for this package.
enforce_rro_enabled := 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. # * 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 # 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)),) else ifneq ($(filter $(TARGET_OUT)/%,$(LOCAL_MODULE_PATH)),)
enforce_rro_enabled := true enforce_rro_enabled := true
endif 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 enforce_rro_enabled := true
endif
endif endif
product_package_overlays := $(strip \ 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 include $(BUILD_SYSTEM)/link_type.mk
endif # !LOCAL_IS_HOST_MODULE 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, \ $(call append_enforce_rro_sources, \
$(my_register_name), \ $(my_register_name), \
false, \ false, \
@@ -248,9 +249,9 @@ ifdef LOCAL_SOONG_DEVICE_RRO_DIRS
$(LOCAL_SOONG_DEVICE_RRO_DIRS), \ $(LOCAL_SOONG_DEVICE_RRO_DIRS), \
vendor \ vendor \
) )
endif endif
ifdef LOCAL_SOONG_PRODUCT_RRO_DIRS ifdef LOCAL_SOONG_PRODUCT_RRO_DIRS
$(call append_enforce_rro_sources, \ $(call append_enforce_rro_sources, \
$(my_register_name), \ $(my_register_name), \
false, \ false, \
@@ -259,6 +260,7 @@ ifdef LOCAL_SOONG_PRODUCT_RRO_DIRS
$(LOCAL_SOONG_PRODUCT_RRO_DIRS), \ $(LOCAL_SOONG_PRODUCT_RRO_DIRS), \
product \ product \
) )
endif
endif endif
ifdef LOCAL_PREBUILT_COVERAGE_ARCHIVE ifdef LOCAL_PREBUILT_COVERAGE_ARCHIVE