StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use PlatformSdkVersion from Make

Browse Source 
This doesn't need to be hardcoded, and should be updated anyways.

Change-Id: Ie28d0d7655e8db3c02d110ae578a763a69b73f92
This commit is contained in:
Dan Willemsen
2016-07-19 19:08:14 -07:00
parent 8195ed10a4
commit 5951c8a3a9
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/config.go
View File

@@ -20,6 +20,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"runtime" "runtime"
"strconv"
"strings" "strings"
"sync" "sync"
@@ -278,7 +279,7 @@ func (c *config) PlatformVersion() string {
} }
func (c *config) PlatformSdkVersion() string { func (c *config) PlatformSdkVersion() string {
return "22" return strconv.Itoa(*c.ProductVariables.Platform_sdk_version)
} }
func (c *config) BuildNumber() string { func (c *config) BuildNumber() string {

2
android/variable.go
View File

@@ -115,7 +115,7 @@ func stringPtr(v string) *string {
func (v *productVariables) SetDefaultConfig() { func (v *productVariables) SetDefaultConfig() {
*v = productVariables{ *v = productVariables{
Platform_sdk_version: intPtr(22), Platform_sdk_version: intPtr(23),
HostArch: stringPtr("x86_64"), HostArch: stringPtr("x86_64"),
HostSecondaryArch: stringPtr("x86"), HostSecondaryArch: stringPtr("x86"),
DeviceName: stringPtr("flounder"), DeviceName: stringPtr("flounder"),