tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
am: 8f0f1757f5

Change-Id: Ida38854d79f2443f15e5121bb866f17619fd0f0a
This commit is contained in:
Dan Albert 2016-11-10 18:03:44 +00:00 committed by android-build-merger
commit c273d449e2
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/config.go
View file

@ -323,12 +323,8 @@ 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.PlatformSdkVersionInt()) return strconv.Itoa(*c.ProductVariables.Platform_sdk_version)
} }
func (c *config) BuildNumber() string { func (c *config) BuildNumber() string {

11
cc/ndk_library.go
View file

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