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

Merge "Use the platform SDK version from the config."

Browse Source
This commit is contained in:
Treehugger Robot
2016-11-09 00:17:46 +00:00
committed by Gerrit Code Review
parent d56d359f8c 9bef523809
commit fc75232555
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/config.go
View File

@@ -323,8 +323,12 @@ func (c *config) PlatformVersion() string {
return "M" return "M"
} }
func (c *config) PlatformSdkVersionInt() int {
return *c.ProductVariables.Platform_sdk_version
}
func (c *config) PlatformSdkVersion() string { func (c *config) PlatformSdkVersion() string {
return strconv.Itoa(*c.ProductVariables.Platform_sdk_version) return strconv.Itoa(c.PlatformSdkVersionInt())
} }
func (c *config) BuildNumber() string { func (c *config) BuildNumber() string {

11
cc/ndk_library.go
View File

@@ -139,16 +139,7 @@ func normalizeNdkApiLevel(apiLevel string, arch android.Arch) (int, error) {
} }
func generateStubApiVariants(mctx android.BottomUpMutatorContext, c *stubDecorator) { func generateStubApiVariants(mctx android.BottomUpMutatorContext, c *stubDecorator) {
// TODO(danalbert): Use PlatformSdkVersion when possible. maxVersion := mctx.AConfig().PlatformSdkVersionInt()
// 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
firstVersion, err := normalizeNdkApiLevel(c.properties.First_version, firstVersion, err := normalizeNdkApiLevel(c.properties.First_version,
mctx.Arch()) mctx.Arch())