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

Merge "Force PRODUCT_NOTICE_SPLIT." into main am: 6b5b3b40bd am: c6b5ea519d

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

Change-Id: Ia63d425b13329bd6f6f051b757bfb1a3b2fe0022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Steven Moreland
2023-12-27 19:41:44 +00:00
committed by Automerger Merge Worker
parent d2272c10ff c6b5ea519d
commit edfdf41255
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/config.mk
View File

@@ -110,6 +110,7 @@ $(KATI_obsolete_var BUILD_BROKEN_DUP_COPY_HEADERS)
$(KATI_obsolete_var BUILD_BROKEN_ENG_DEBUG_TAGS) $(KATI_obsolete_var BUILD_BROKEN_ENG_DEBUG_TAGS)
$(KATI_obsolete_export It is a global setting. See $(CHANGES_URL)#export_keyword) $(KATI_obsolete_export It is a global setting. See $(CHANGES_URL)#export_keyword)
$(KATI_obsolete_var BUILD_BROKEN_ANDROIDMK_EXPORTS) $(KATI_obsolete_var BUILD_BROKEN_ANDROIDMK_EXPORTS)
$(KATI_obsolete_var PRODUCT_NOTICE_SPLIT_OVERRIDE,Stop using this, keep calm, and carry on.)
$(KATI_obsolete_var PRODUCT_STATIC_BOOT_CONTROL_HAL,Use shared library module instead. See $(CHANGES_URL)#PRODUCT_STATIC_BOOT_CONTROL_HAL) $(KATI_obsolete_var PRODUCT_STATIC_BOOT_CONTROL_HAL,Use shared library module instead. See $(CHANGES_URL)#PRODUCT_STATIC_BOOT_CONTROL_HAL)
$(KATI_obsolete_var \ $(KATI_obsolete_var \
ARCH_ARM_HAVE_ARMV7A \ ARCH_ARM_HAVE_ARMV7A \
@@ -777,16 +778,9 @@ else ifneq ($(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),26),)
PRODUCT_FULL_TREBLE := true PRODUCT_FULL_TREBLE := true
endif endif
# TODO(b/69865032): Make PRODUCT_NOTICE_SPLIT the default behavior and remove
# references to it here and below.
ifdef PRODUCT_NOTICE_SPLIT_OVERRIDE
$(error PRODUCT_NOTICE_SPLIT_OVERRIDE cannot be set.)
endif
requirements := \ requirements := \
PRODUCT_TREBLE_LINKER_NAMESPACES \ PRODUCT_TREBLE_LINKER_NAMESPACES \
PRODUCT_ENFORCE_VINTF_MANIFEST \ PRODUCT_ENFORCE_VINTF_MANIFEST
PRODUCT_NOTICE_SPLIT
# If it is overriden, then the requirement override is taken, otherwise it's # If it is overriden, then the requirement override is taken, otherwise it's
# PRODUCT_FULL_TREBLE # PRODUCT_FULL_TREBLE
@@ -799,12 +793,16 @@ $(foreach req,$(requirements),$(eval \
PRODUCT_FULL_TREBLE_OVERRIDE ?= PRODUCT_FULL_TREBLE_OVERRIDE ?=
$(foreach req,$(requirements),$(eval $(req)_OVERRIDE ?=)) $(foreach req,$(requirements),$(eval $(req)_OVERRIDE ?=))
# used to be a part of PRODUCT_FULL_TREBLE, but now always set it
PRODUCT_NOTICE_SPLIT := true
# TODO(b/114488870): disallow PRODUCT_FULL_TREBLE_OVERRIDE from being used. # TODO(b/114488870): disallow PRODUCT_FULL_TREBLE_OVERRIDE from being used.
.KATI_READONLY := \ .KATI_READONLY := \
PRODUCT_FULL_TREBLE_OVERRIDE \ PRODUCT_FULL_TREBLE_OVERRIDE \
$(foreach req,$(requirements),$(req)_OVERRIDE) \ $(foreach req,$(requirements),$(req)_OVERRIDE) \
$(requirements) \ $(requirements) \
PRODUCT_FULL_TREBLE \ PRODUCT_FULL_TREBLE \
PRODUCT_NOTICE_SPLIT \
$(KATI_obsolete_var $(foreach req,$(requirements),$(req)_OVERRIDE) \ $(KATI_obsolete_var $(foreach req,$(requirements),$(req)_OVERRIDE) \
,This should be referenced without the _OVERRIDE suffix.) ,This should be referenced without the _OVERRIDE suffix.)