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

Commit a710d440 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge changes from topic "kati-obsolete-full-treble" 

am: 2b1f0d18

Change-Id: Ie267f97dc3fdd884a7a780d346880b7ff02d5d2e
parents f6c5be1e 2b1f0d18

core/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -841,7 +841,8 @@ installed_notice_html_or_xml_gz := $(TARGET_OUT)/etc/NOTICE.html.gz 
tools_notice_file_txt := $(HOST_OUT_INTERMEDIATES)/NOTICE.txt

tools_notice_file_html := $(HOST_OUT_INTERMEDIATES)/NOTICE.html



ifeq ($(PRODUCT_FULL_TREBLE),true)

# TODO(b/69865032): Make PRODUCT_NOTICE_SPLIT the default behavior.

ifeq ($(PRODUCT_NOTICE_SPLIT),true)

target_notice_file_html_or_xml := $(TARGET_OUT_INTERMEDIATES)/NOTICE.xml

target_notice_file_html_or_xml_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE.xml.gz

installed_notice_html_or_xml_gz := $(TARGET_OUT)/etc/NOTICE.xml.gz

core/config.mk

+7 −0
Original line number Diff line number Diff line
@@ -748,10 +748,17 @@ 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_SEPOLICY_SPLIT \

    PRODUCT_ENFORCE_VINTF_MANIFEST \

    PRODUCT_NOTICE_SPLIT



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

# PRODUCT_FULL_TREBLE

core/main.mk

+7 −0
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ ifneq ($(ADDITIONAL_BUILD_PROPERTIES),) 
$(error ADDITIONAL_BUILD_PROPERTIES must not be set before here: $(ADDITIONAL_BUILD_PROPERTIES))

endif



ADDITIONAL_BUILD_PROPERTIES :=



#

# -----------------------------------------------------------------

# Add the product-defined properties to the build properties.
@@ -198,6 +200,11 @@ endif 


ADDITIONAL_BUILD_PROPERTIES += ro.treble.enabled=${PRODUCT_FULL_TREBLE}



$(KATI_obsolete_var PRODUCT_FULL_TREBLE,\

	Code should be written to work regardless of a device being Treble or \

	variables like PRODUCT_SEPOLICY_SPLIT should be used until that is \

	possible.)



# -----------------------------------------------------------------

###

### In this section we set up the things that are different