From 073379e54958b68fa1de96b6d38763eb24aafe1f Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Thu, 10 Nov 2016 10:46:36 -0800
Subject: [PATCH] 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
---
 android/config.go |  6 +++++-
 cc/ndk_library.go | 11 +----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/android/config.go b/android/config.go
index f6ca2e75e..725f43de0 100644
--- a/android/config.go
+++ b/android/config.go
@@ -323,8 +323,12 @@ func (c *config) PlatformVersion() string {
 	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 {
diff --git a/cc/ndk_library.go b/cc/ndk_library.go
index 48fbf4ddf..94be17c5b 100644
--- a/cc/ndk_library.go
+++ b/cc/ndk_library.go
@@ -139,16 +139,7 @@ func normalizeNdkApiLevel(apiLevel string, arch android.Arch) (int, error) {
 }
 
 func generateStubApiVariants(mctx android.BottomUpMutatorContext, c *stubDecorator) {
-	// TODO(danalbert): Use PlatformSdkVersion when possible.
-	// This is an interesting case because for the moment we actually need 24
-	// even though the latest released version in aosp is 23. prebuilts/ndk/r11
-	// has android-24 versions of libraries, and as platform libraries get
-	// migrated the libraries in prebuilts will need to depend on them.
-	//
-	// Once everything is all moved over to the new stuff (when there isn't a
-	// prebuilts/ndk any more) then this should be fixable, but for now I think
-	// it needs to remain as-is.
-	maxVersion := 24
+	maxVersion := mctx.AConfig().PlatformSdkVersionInt()
 
 	firstVersion, err := normalizeNdkApiLevel(c.properties.First_version,
 		mctx.Arch())