diff --git a/android/config.go b/android/config.go
index a4624c7..0eebb5f 100644
--- a/android/config.go
+++ b/android/config.go
@@ -632,11 +632,12 @@
 	return "vendor"
 }
 
-func (c *deviceConfig) CompileVndk() bool {
-	if c.config.ProductVariables.DeviceVndkVersion == nil {
-		return false
-	}
-	return *c.config.ProductVariables.DeviceVndkVersion == "current"
+func (c *deviceConfig) VndkVersion() string {
+	return String(c.config.ProductVariables.DeviceVndkVersion)
+}
+
+func (c *deviceConfig) ExtraVndkVersions() []string {
+	return c.config.ProductVariables.ExtraVndkVersions
 }
 
 func (c *deviceConfig) BtConfigIncludeDir() string {
diff --git a/android/variable.go b/android/variable.go
index e8d5c69..a3920a1 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -192,6 +192,8 @@
 
 	DeviceKernelHeaders []string `json:",omitempty"`
 	DistDir             *string  `json:",omitempty"`
+
+	ExtraVndkVersions []string `json:",omitempty"`
 }
 
 func boolPtr(v bool) *bool {