diff --git a/cc/ndk_library.go b/cc/ndk_library.go
index aea0d52fe..da3d5c7b7 100644
--- a/cc/ndk_library.go
+++ b/cc/ndk_library.go
@@ -162,6 +162,14 @@ func shouldUseVersionScript(stub *stubDecorator) (bool, error) {
 		return true, nil
 	}
 
+	if stub.properties.Unversioned_until == "current" {
+		if stub.properties.ApiLevel == "current" {
+			return true, nil
+		} else {
+			return false, nil
+		}
+	}
+
 	if stub.properties.ApiLevel == "current" {
 		return true, nil
 	}