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
diff --git a/core/config.mk b/core/config.mk
index c0dea95..856cb48 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -711,27 +711,11 @@
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)
+# Starting in Android U, non-VNDK devices not supported
+ifndef BOARD_VNDK_VERSION
+BOARD_VNDK_VERSION := current
endif
-ifeq ($(PRODUCT_USE_VNDK),true)
- 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
# VNDK for product partition is not available unless BOARD_VNDK_VERSION