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

Commit 46a6081c authored by Steven Moreland's avatar Steven Moreland
Browse files

BOARD_VNDK_VERSION always by default 

There is a lot of pending cleanup pending on always having
the VNDK enabled. For instance, when some devices always
build with the core variant, it is impossible to have code
excluded from the system variant, since vendor code on
non-VNDK devices wouldn't be able to build.

This CL merely disables the flag. When it lands, there is a
lot of cleanup that would follow.

Bug: 122954981
Test: ¯\_(ツ)_/¯ removing untested paths
Change-Id: Ia9380fe54729ce1ab37cf0f5e8512be45cd550c7
parent 5cf82179

core/config.mk

+3 −19
Original line number Diff line number Diff line
@@ -711,26 +711,10 @@ ifeq ($(PRODUCT_FULL_TREBLE),true) 
  BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED ?= true

endif



# If PRODUCT_USE_VNDK is true and BOARD_VNDK_VERSION is not defined yet,

# BOARD_VNDK_VERSION will be set to "current" as default.

# PRODUCT_USE_VNDK will be true in Android-P or later launching devices.

PRODUCT_USE_VNDK := false

ifneq ($(PRODUCT_USE_VNDK_OVERRIDE),)

  PRODUCT_USE_VNDK := $(PRODUCT_USE_VNDK_OVERRIDE)

else ifeq ($(PRODUCT_SHIPPING_API_LEVEL),)

  # No shipping level defined

else ifeq ($(call math_gt,$(PRODUCT_SHIPPING_API_LEVEL),27),true)

  PRODUCT_USE_VNDK := $(PRODUCT_FULL_TREBLE)

endif



ifeq ($(PRODUCT_USE_VNDK),true)

# Starting in Android U, non-VNDK devices not supported

ifndef BOARD_VNDK_VERSION

BOARD_VNDK_VERSION := current

endif

endif



$(KATI_obsolete_var PRODUCT_USE_VNDK,Use BOARD_VNDK_VERSION instead)

$(KATI_obsolete_var PRODUCT_USE_VNDK_OVERRIDE,Use BOARD_VNDK_VERSION instead)



ifdef PRODUCT_PRODUCT_VNDK_VERSION

  ifndef BOARD_VNDK_VERSION