commit 6e8115acb14a32709746b5415f94a958be929c4b
author Jayant Chowdhary <jchowdhary@google.com> Tue May 09 10:21:52 2017 -0700
committer Jayant Chowdhary <jchowdhary@google.com> Tue May 09 14:38:10 2017 -0700
tree 42458ecb5d0207106bb20110809e289ace91b35d
parent 970711686733f2e2e0abdf05ba96d8228faf09d2

Work-around for crt objects with sdk: current

Test: convert libcups from Android.mk->Android.bp, mm -j64.

Change-Id: I4fddcfa5806d0ce27a229c37a078b0d93e9082a8

cc/library.go

diff --git a/cc/library.go b/cc/library.go
index 12a866b..d6a85e9 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -424,7 +424,7 @@
 				// version.
 				version := ctx.sdkVersion()
 				if version == "current" {
-					version = ctx.AConfig().PlatformSdkVersion()
+					version = getCurrentNdkPrebuiltVersion(ctx)
 				}
 				deps.CrtBegin = "ndk_crtbegin_so." + version
 				deps.CrtEnd = "ndk_crtend_so." + version