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

Commit f32645f1 authored by Steven Moreland's avatar Steven Moreland
Browse files

Add soong variable for PRODUCT_FULL_TREBLE. 

Required to preserve sane defaults for old codebases.

Test: inspect soong.variables
Test: ensure PRODUCT_SHIPPING_API_LEVEL is set in config.mk
Bug: 38415912
Merged-In: I0244fb02754663be3106391c9360fd1b2cc00d4a
Change-Id: I0244fb02754663be3106391c9360fd1b2cc00d4a
parent b7abad08

core/config.mk

+10 −0
Original line number Diff line number Diff line
@@ -679,6 +679,16 @@ APICHECK_CLASSPATH := $(APICHECK_CLASSPATH):$(HOST_OUT_JAVA_LIBRARIES)/doclava$( 
APICHECK_CLASSPATH := $(APICHECK_CLASSPATH):$(HOST_OUT_JAVA_LIBRARIES)/jsilver$(COMMON_JAVA_PACKAGE_SUFFIX)

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



# Boolean variable determining if Treble is fully enabled

PRODUCT_FULL_TREBLE := false

ifneq ($(PRODUCT_FULL_TREBLE_OVERRIDE),)

  PRODUCT_FULL_TREBLE := $(PRODUCT_FULL_TREBLE_OVERRIDE)

else ifeq ($(PRODUCT_SHIPPING_API_LEVEL),)

  #$(warning no product shipping level defined)

else ifneq ($(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),26),)

  PRODUCT_FULL_TREBLE := true

endif



# The default key if not set as LOCAL_CERTIFICATE

ifdef PRODUCT_DEFAULT_DEV_CERTIFICATE

  DEFAULT_SYSTEM_DEV_CERTIFICATE := $(PRODUCT_DEFAULT_DEV_CERTIFICATE)

core/main.mk

+0 −10
Original line number Diff line number Diff line
@@ -333,16 +333,6 @@ ifneq ($(PLATFORM_VERSION_CODENAME),REL) 
  ADDITIONAL_BUILD_PROPERTIES += ro.bionic.ld.warning=1

endif



# Boolean variable determining if Treble is fully enabled

PRODUCT_FULL_TREBLE := false

ifeq ($(PRODUCT_FULL_TREBLE_OVERRIDE),true)

  PRODUCT_FULL_TREBLE := true

else ifeq ($(PRODUCT_SHIPPING_API_LEVEL),)

  #$(warning no product shipping level defined)

else ifneq ($(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),26),)

  PRODUCT_FULL_TREBLE := true

endif



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

###

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

core/soong_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ $(SOONG_VARIABLES): FORCE 
	echo '    "CrossHostSecondaryArch": "$(HOST_CROSS_2ND_ARCH)",'; \

	echo '    "Safestack": $(if $(filter true,$(USE_SAFESTACK)),true,false),'; \

	echo '    "EnableCFI": $(if $(filter true,$(ENABLE_CFI)),true,false),'; \

	echo '    "Treble": $(if $(filter true,$(PRODUCT_FULL_TREBLE)),true,false),'; \

	echo ''; \

	echo '    "ArtUseReadBarrier": $(if $(filter false,$(PRODUCT_ART_USE_READ_BARRIER)),false,true),'; \

	echo ''; \