diff --git a/core/binary.mk b/core/binary.mk
index 6b4fa5aec..32f8ebea3 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -112,12 +112,12 @@ ifneq ($(LOCAL_SDK_VERSION)$(LOCAL_USE_VNDK),)
   # that for the generated libraries. Clip the API level to the minimum where
   # appropriate.
   ifdef LOCAL_USE_VNDK
-    my_ndk_api := $(BOARD_VNDK_VERSION)
+    my_ndk_api := current
   else
     my_ndk_api := $(LOCAL_SDK_VERSION)
-  endif
-  ifneq ($(my_ndk_api),current)
+    ifneq ($(my_ndk_api),current)
       my_ndk_api := $(call math_max,$(my_ndk_api),$(my_min_sdk_version))
+    endif
   endif
 
   my_ndk_api_def := $(my_ndk_api)
diff --git a/core/envsetup.mk b/core/envsetup.mk
index 880d310cd..67ac7516f 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -255,6 +255,13 @@ ifeq ($(AB_OTA_UPDATER),true)
   endif
 endif
 
+# Check BOARD_VNDK_VERSION
+ifdef BOARD_VNDK_VERSION
+  ifneq ($(BOARD_VNDK_VERSION),current)
+    $(error BOARD_VNDK_VERSION: Only "current" is implemented)
+  endif
+endif
+
 # ---------------------------------------------------------------
 # Set up configuration for target machine.
 # The following must be set: