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

Commit 1f70f332 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "full-treble-split" 

* changes:
  Break up PRODUCT_FULL_TREBLE into variables.
  Use PRODUCT_ENFORCE_VINTF_MANIFEST.
parents 44cb0db6 33fdd8c4

core/config.mk

+19 −0
Original line number Diff line number Diff line
@@ -700,6 +700,25 @@ else ifneq ($(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),26),) 
  PRODUCT_FULL_TREBLE := true

endif



requirements := \

    PRODUCT_TREBLE_LINKER_NAMESPACES \

    PRODUCT_SEPOLICY_SPLIT \

    PRODUCT_ENFORCE_VINTF_MANIFEST \



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

# PRODUCT_FULL_TREBLE

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

    $(req) := $(if $($(req)_OVERRIDE),$($(req)_OVERRIDE),$(PRODUCT_FULL_TREBLE))))

# If the requirement is false for any reason, then it's not PRODUCT_FULL_TREBLE

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

    PRODUCT_FULL_TREBLE := $(if $(filter false,$($(req))),false,$(PRODUCT_FULL_TREBLE))))



.KATI_READONLY := \

    $(requirements) \

    PRODUCT_FULL_TREBLE



requirements :=



# The default key if not set as LOCAL_CERTIFICATE

ifdef PRODUCT_DEFAULT_DEV_CERTIFICATE

  DEFAULT_SYSTEM_DEV_CERTIFICATE := $(PRODUCT_DEFAULT_DEV_CERTIFICATE)

target/board/Android.mk

+2 −6
Original line number Diff line number Diff line
@@ -78,9 +78,7 @@ GEN := $(local-generated-sources-dir)/manifest.xml 


$(GEN): PRIVATE_FLAGS :=



# TODO(b/37954458), (b/37321309) remove check of PRODUCT_FULL_TREBLE after

# putting device compatibility matrices for non-treble devices.

ifeq ($(PRODUCT_FULL_TREBLE),true)

ifeq ($(PRODUCT_ENFORCE_VINTF_MANIFEST),true)

ifdef BUILT_VENDOR_MATRIX

$(GEN): $(BUILT_VENDOR_MATRIX)

$(GEN): PRIVATE_FLAGS += -c "$(BUILT_VENDOR_MATRIX)"
@@ -105,9 +103,7 @@ GEN := $(local-generated-sources-dir)/compatibility_matrix.xml 


$(GEN): PRIVATE_FLAGS :=



# TODO(b/37954458), (b/37321309) remove check of PRODUCT_FULL_TREBLE after

# putting complete HAL manifests on non-treble devices.

ifeq ($(PRODUCT_FULL_TREBLE),true)

ifeq ($(PRODUCT_ENFORCE_VINTF_MANIFEST),true)

ifdef BUILT_VENDOR_MANIFEST

$(GEN): $(BUILT_VENDOR_MANIFEST)

$(GEN): PRIVATE_FLAGS += -c "$(BUILT_VENDOR_MANIFEST)"