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

Commit 8b4b0cc5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Enforce PRODUCT_COMPATIBLE_PROPERTY for products shipping with Android P"

parents 469aafe4 0538ff79

core/config.mk

+13 −0
Original line number Diff line number Diff line
@@ -742,6 +742,19 @@ APICHECK_CLASSPATH := $(subst $(space),:,$(strip $(APICHECK_CLASSPATH_ENTRIES))) 


APICHECK_COMMAND := $(APICHECK) -JXmx1024m -J"classpath $(APICHECK_CLASSPATH)"



# Boolean variable determining if the whitelist for compatible properties is enabled

PRODUCT_COMPATIBLE_PROPERTY := false

ifneq ($(PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE),)

  PRODUCT_COMPATIBLE_PROPERTY := $(PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE)

else ifeq ($(PRODUCT_SHIPPING_API_LEVEL),)

  #$(warning no product shipping level defined)

else ifneq ($(call math_lt,27,$(PRODUCT_SHIPPING_API_LEVEL)),)

  PRODUCT_COMPATIBLE_PROPERTY := true

endif



.KATI_READONLY := \

    PRODUCT_COMPATIBLE_PROPERTY



# Boolean variable determining if Treble is fully enabled

PRODUCT_FULL_TREBLE := false

ifneq ($(PRODUCT_FULL_TREBLE_OVERRIDE),)

core/main.mk

+8 −0
Original line number Diff line number Diff line
@@ -205,6 +205,14 @@ $(KATI_obsolete_var PRODUCT_FULL_TREBLE,\ 
	variables like PRODUCT_SEPOLICY_SPLIT should be used until that is \

	possible.)



# Sets ro.actionable_compatible_property.enabled to know on runtime whether the whitelist

# of actionable compatible properties is enabled or not.

ifeq ($(PRODUCT_ACTIONABLE_COMPATIBLE_PROPERTY_DISABLE),true)

ADDITIONAL_DEFAULT_PROPERTIES += ro.actionable_compatible_property.enabled=false

else

ADDITIONAL_DEFAULT_PROPERTIES += ro.actionable_compatible_property.enabled=${PRODUCT_COMPATIBLE_PROPERTY}

endif



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

###

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

core/product.mk

+2 −0
Original line number Diff line number Diff line
@@ -149,6 +149,8 @@ _product_var_list := \ 
    PRODUCT_ADB_KEYS \

    PRODUCT_CFI_INCLUDE_PATHS \

    PRODUCT_CFI_EXCLUDE_PATHS \

    PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE \

    PRODUCT_ACTIONABLE_COMPATIBLE_PROPERTY_DISABLE \



define dump-product

$(info ==== $(1) ====)\

core/product_config.mk

+8 −0
Original line number Diff line number Diff line
@@ -484,3 +484,11 @@ PRODUCT_CFI_INCLUDE_PATHS := \ 
# which Soong namespaces to export to Make

PRODUCT_SOONG_NAMESPACES :=

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SOONG_NAMESPACES))



# A flag to override PRODUCT_COMPATIBLE_PROPERTY

PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE))



# Whether the whitelist of actionable compatible properties should be disabled or not

PRODUCT_ACTIONABLE_COMPATIBLE_PROPERTY_DISABLE := \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ACTIONABLE_COMPATIBLE_PROPERTY_DISABLE))