Merge "Move setting default BOARD_VNDK_VERSION value" into main
diff --git a/core/config.mk b/core/config.mk
index b8d4865..dbee0a0 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -374,19 +374,6 @@
endif
-include $(ANDROID_BUILDSPEC)
-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
-
-
# ---------------------------------------------------------------
# Define most of the global variables. These are the ones that
# are specific to the user's build configuration.
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