From 5951c8a3a98fd7bbbd9ad8a2710b4845d528f300 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 19 Jul 2016 19:08:14 -0700 Subject: [PATCH] Use PlatformSdkVersion from Make This doesn't need to be hardcoded, and should be updated anyways. Change-Id: Ie28d0d7655e8db3c02d110ae578a763a69b73f92 --- android/config.go | 3 ++- android/variable.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/android/config.go b/android/config.go index 0f65410fc..ae0475696 100644 --- a/android/config.go +++ b/android/config.go @@ -20,6 +20,7 @@ import ( "os" "path/filepath" "runtime" + "strconv" "strings" "sync" @@ -278,7 +279,7 @@ func (c *config) PlatformVersion() string { } func (c *config) PlatformSdkVersion() string { - return "22" + return strconv.Itoa(*c.ProductVariables.Platform_sdk_version) } func (c *config) BuildNumber() string { diff --git a/android/variable.go b/android/variable.go index a2313d58f..b0639ae5c 100644 --- a/android/variable.go +++ b/android/variable.go @@ -115,7 +115,7 @@ func stringPtr(v string) *string { func (v *productVariables) SetDefaultConfig() { *v = productVariables{ - Platform_sdk_version: intPtr(22), + Platform_sdk_version: intPtr(23), HostArch: stringPtr("x86_64"), HostSecondaryArch: stringPtr("x86"), DeviceName: stringPtr("flounder"),