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

Commit 226df907 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert^2 "Always turn on compatible property"" am: dec924e0 

Original change: https://android-review.googlesource.com/c/platform/build/+/1505351

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id68e6e4318a46a7909761876f625692fa975760d
parents defa1934 dec924e0

core/config.mk

+3 −7
Original line number Diff line number Diff line
@@ -605,13 +605,9 @@ HOST_JDK_TOOLS_JAR := $(ANDROID_JAVA8_HOME)/lib/tools.jar 
APICHECK_COMMAND := $(JAVA) -Xmx4g -jar $(APICHECK) --no-banner --compatible-output=no



# Boolean variable determining if the allow list 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

ifeq ($(PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE),false)

  $(error PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE is obsolete)

endif



.KATI_READONLY := \

core/main.mk

+1 −5
Original line number Diff line number Diff line
@@ -193,11 +193,7 @@ $(KATI_obsolete_var PRODUCT_FULL_TREBLE,\ 


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

# allowed list of actionable compatible properties is enabled or not.

ifeq ($(PRODUCT_ACTIONABLE_COMPATIBLE_PROPERTY_DISABLE),true)

ADDITIONAL_SYSTEM_PROPERTIES += ro.actionable_compatible_property.enabled=false

else

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

endif

ADDITIONAL_SYSTEM_PROPERTIES += ro.actionable_compatible_property.enabled=true



# Add the system server compiler filter if they are specified for the product.

ifneq (,$(PRODUCT_SYSTEM_SERVER_COMPILER_FILTER))

core/product.mk

+0 −6
Original line number Diff line number Diff line
@@ -315,9 +315,6 @@ _product_list_vars += PRODUCT_CFI_EXCLUDE_PATHS 
# Whether the Scudo hardened allocator is disabled platform-wide

_product_single_value_vars += PRODUCT_DISABLE_SCUDO



# A flag to override PRODUCT_COMPATIBLE_PROPERTY

_product_single_value_vars += PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE



# List of extra VNDK versions to be included

_product_list_vars += PRODUCT_EXTRA_VNDK_VERSIONS
@@ -328,9 +325,6 @@ _product_single_value_vars += PRODUCT_COMPRESSED_APEX 
# partitions uses PLATFORM_VNDK_VERSION.

_product_single_value_vars += PRODUCT_PRODUCT_VNDK_VERSION



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

_product_single_value_vars += PRODUCT_ACTIONABLE_COMPATIBLE_PROPERTY_DISABLE



_product_single_value_vars += PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS

_product_single_value_vars += PRODUCT_ENFORCE_ARTIFACT_SYSTEM_CERTIFICATE_REQUIREMENT

_product_list_vars += PRODUCT_ARTIFACT_SYSTEM_CERTIFICATE_REQUIREMENT_ALLOW_LIST

core/soong_config.mk

+0 −1
Original line number Diff line number Diff line
@@ -193,7 +193,6 @@ $(call add_json_list, ProductHiddenAPIStubsTest, $(PRODUCT_HIDDENAPI_STU 


$(call add_json_list, ProductPublicSepolicyDirs,         $(PRODUCT_PUBLIC_SEPOLICY_DIRS))

$(call add_json_list, ProductPrivateSepolicyDirs,        $(PRODUCT_PRIVATE_SEPOLICY_DIRS))

$(call add_json_bool, ProductCompatibleProperty,         $(PRODUCT_COMPATIBLE_PROPERTY))



$(call add_json_list, TargetFSConfigGen,                 $(TARGET_FS_CONFIG_GEN))