Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b5b3b40 authored by Steven Moreland's avatar Steven Moreland Committed by Gerrit Code Review
Browse files

Merge "Force PRODUCT_NOTICE_SPLIT." into main

parents c77d458a 5c11308f

core/config.mk

+6 −8
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ $(KATI_obsolete_var BUILD_BROKEN_DUP_COPY_HEADERS) 
$(KATI_obsolete_var BUILD_BROKEN_ENG_DEBUG_TAGS)

$(KATI_obsolete_export It is a global setting. See $(CHANGES_URL)#export_keyword)

$(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 \

  ARCH_ARM_HAVE_ARMV7A \
@@ -777,16 +778,9 @@ else ifneq ($(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),26),) 
  PRODUCT_FULL_TREBLE := true

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 := \

    PRODUCT_TREBLE_LINKER_NAMESPACES \

    PRODUCT_ENFORCE_VINTF_MANIFEST \

    PRODUCT_NOTICE_SPLIT

    PRODUCT_ENFORCE_VINTF_MANIFEST



# If it is overriden, then the requirement override is taken, otherwise it's

# PRODUCT_FULL_TREBLE
@@ -799,12 +793,16 @@ $(foreach req,$(requirements),$(eval \ 
PRODUCT_FULL_TREBLE_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.

.KATI_READONLY := \

    PRODUCT_FULL_TREBLE_OVERRIDE \

    $(foreach req,$(requirements),$(req)_OVERRIDE) \

    $(requirements) \

    PRODUCT_FULL_TREBLE \

    PRODUCT_NOTICE_SPLIT \



$(KATI_obsolete_var $(foreach req,$(requirements),$(req)_OVERRIDE) \

    ,This should be referenced without the _OVERRIDE suffix.)