diff --git a/cc/cc.go b/cc/cc.go
index 0ed6238..5dee32e 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1567,11 +1567,12 @@
 	}
 
 	if ctx.ctx.Device() {
-		// When building for vendor/product, use the latest _stable_ API as "current".
-		// This is passed to clang/aidl compilers so that compiled/generated code works
-		// with the system.
-		if (ctx.inVendor() || ctx.inProduct()) && (ver == "" || ver == "current") {
-			ver = ctx.ctx.Config().PlatformSdkVersion().String()
+		config := ctx.ctx.Config()
+		if ctx.inVendor() {
+			// If building for vendor with final API, then use the latest _stable_ API as "current".
+			if config.VendorApiLevelFrozen() && (ver == "" || ver == "current") {
+				ver = config.PlatformSdkVersion().String()
+			}
 		}
 	}