Move setting default BOARD_VNDK_VERSION value
Current BOARD_VNDK_VERSION is being set from config.mk, but this is
before build system loads release config and checks if VNDK is
deprecated or not. Move this to envsetup so it can set up
BOARD_VNDK_VERSION only when VNDK is not deprecated with flag.
Bug: 324976878
Test: mainline release target build succeeded
Change-Id: I490cc431038f5cebc40d03c98d2666eaba906664
diff --git a/core/envsetup.mk b/core/envsetup.mk
index c286135..30a6c06 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -57,6 +57,18 @@
KEEP_VNDK ?= true
endif
+ifeq ($(KEEP_VNDK),true)
+ # Starting in Android U, non-VNDK devices not supported
+ # WARNING: DO NOT CHANGE: if you are downstream of AOSP, and you change this, without
+ # letting upstream know it's important to you, we may do cleanup which breaks this
+ # significantly. Please let us know if you are changing this.
+ ifndef BOARD_VNDK_VERSION
+ # READ WARNING - DO NOT CHANGE
+ BOARD_VNDK_VERSION := current
+ # READ WARNING - DO NOT CHANGE
+ endif
+endif
+
# ---------------------------------------------------------------
# Set up version information
include $(BUILD_SYSTEM)/version_util.mk