diff --git a/android/config.go b/android/config.go
index 549abe9..fafed6b 100644
--- a/android/config.go
+++ b/android/config.go
@@ -468,6 +468,10 @@
 	return *c.productVariables.ResourceOverlays
 }
 
+func (c *config) PlatformVersionName() string {
+	return String(c.productVariables.Platform_version_name)
+}
+
 func (c *config) PlatformSdkVersionInt() int {
 	return *c.productVariables.Platform_sdk_version
 }
diff --git a/android/variable.go b/android/variable.go
index 9d9830e..f4aaec7 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -127,6 +127,7 @@
 	BuildNumberFromFile *string `json:",omitempty"`
 	DateFromFile        *string `json:",omitempty"`
 
+	Platform_version_name             *string  `json:",omitempty"`
 	Platform_sdk_version              *int     `json:",omitempty"`
 	Platform_sdk_codename             *string  `json:",omitempty"`
 	Platform_sdk_final                *bool    `json:",omitempty"`
diff --git a/java/aar.go b/java/aar.go
index 9e5cddb..66f1cab 100644
--- a/java/aar.go
+++ b/java/aar.go
@@ -150,8 +150,8 @@
 		if ctx.ModuleName() == "framework-res" {
 			// Some builds set AppsDefaultVersionName() to include the build number ("O-123456").  aapt2 copies the
 			// version name of framework-res into app manifests as compileSdkVersionCodename, which confuses things
-			// if it contains the build number.  Use the DefaultAppTargetSdk instead.
-			versionName = ctx.Config().DefaultAppTargetSdk()
+			// if it contains the build number.  Use the PlatformVersionName instead.
+			versionName = ctx.Config().PlatformVersionName()
 		} else {
 			versionName = ctx.Config().AppsDefaultVersionName()
 		}
