Revert "Revert "Use the platform SDK version from the config.""
This reverts commit 74b8b55bb28629eb2a2d275f744688b34c2efa5e.
Test: OUT_DIR=ndk-out DIST_DIR=ndk-dist \
build/soong/scripts/build-ndk-prebuilts.sh
Bug: None
Change-Id: Ia320609ec6fb382b13ff9007a6496b73198ff871
diff --git a/android/config.go b/android/config.go
index f6ca2e7..725f43d 100644
--- a/android/config.go
+++ b/android/config.go
@@ -323,8 +323,12 @@
return "M"
}
+func (c *config) PlatformSdkVersionInt() int {
+ return *c.ProductVariables.Platform_sdk_version
+}
+
func (c *config) PlatformSdkVersion() string {
- return strconv.Itoa(*c.ProductVariables.Platform_sdk_version)
+ return strconv.Itoa(c.PlatformSdkVersionInt())
}
func (c *config) BuildNumber() string {