openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Stop versioning NDK stubs pre-M. 

Test: make ndk # readelf various stubs to check version info
Bug: https://github.com/android-ndk/ndk/issues/622
Change-Id: Ic2930cfe5ee8377bb89bfb1bc051b6975f6e57d3
Merged-In: Ic2930cfe5ee8377bb89bfb1bc051b6975f6e57d3
(cherry picked from commit c229f38e93)
This commit is contained in:
Dan Albert 2018-05-03 15:42:34 -07:00 committed by Colin Cross
parent 2358e0400f
commit 6bc5b8320f
2 changed files with 65 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
android/api_levels.go
View File

@ -16,6 +16,7 @@ package android
import ( import (
"encoding/json" "encoding/json"
"strconv"
) )
func init() { func init() {
@ -50,28 +51,48 @@ func GetApiLevelsJson(ctx PathContext) WritablePath {
return PathForOutput(ctx, "api_levels.json") return PathForOutput(ctx, "api_levels.json")
} }
func (a *apiLevelsSingleton) GenerateBuildActions(ctx SingletonContext) { func getApiLevelsMap(config Config) map[string]int {
baseApiLevel := 9000 return config.Once("ApiLevelsMap", func() interface{} {
apiLevelsMap := map[string]int{ baseApiLevel := 9000
"G": 9, apiLevelsMap := map[string]int{
"I": 14, "G": 9,
"J": 16, "I": 14,
"J-MR1": 17, "J": 16,
"J-MR2": 18, "J-MR1": 17,
"K": 19, "J-MR2": 18,
"L": 21, "K": 19,
"L-MR1": 22, "L": 21,
"M": 23, "L-MR1": 22,
"N": 24, "M": 23,
"N-MR1": 25, "N": 24,
"O": 26, "N-MR1": 25,
"O-MR1": 27, "O": 26,
"P": 28, "O-MR1": 27,
} "P": 28,
for i, codename := range ctx.Config().PlatformVersionCombinedCodenames() { }
apiLevelsMap[codename] = baseApiLevel + i for i, codename := range config.PlatformVersionCombinedCodenames() {
} apiLevelsMap[codename] = baseApiLevel + i
}
return apiLevelsMap
}).(map[string]int)
}
// Converts an API level string into its numeric form.
// * Codenames are decoded.
// * Numeric API levels are simply converted.
// * "minimum" and "current" are not currently handled since the former is
// NDK specific and the latter has inconsistent meaning.
func ApiStrToNum(ctx BaseContext, apiLevel string) (int, error) {
num, ok := getApiLevelsMap(ctx.Config())[apiLevel]
if ok {
return num, nil
}
return strconv.Atoi(apiLevel)
}
func (a *apiLevelsSingleton) GenerateBuildActions(ctx SingletonContext) {
apiLevelsMap := getApiLevelsMap(ctx.Config())
apiLevelsJson := GetApiLevelsJson(ctx) apiLevelsJson := GetApiLevelsJson(ctx)
createApiLevelsJson(ctx, apiLevelsJson, apiLevelsMap) createApiLevelsJson(ctx, apiLevelsJson, apiLevelsMap)
} }

31
cc/ndk_library.go
View File

@ -156,11 +156,11 @@ func getFirstGeneratedVersion(firstSupportedVersion string, platformVersion int)
return strconv.Atoi(firstSupportedVersion) return strconv.Atoi(firstSupportedVersion)
} }
func shouldUseVersionScript(stub *stubDecorator) (bool, error) { func shouldUseVersionScript(ctx android.BaseContext, stub *stubDecorator) (bool, error) {
// unversioned_until is normally empty, in which case we should use the version script. // https://github.com/android-ndk/ndk/issues/622
if String(stub.properties.Unversioned_until) == "" { // The loader spews warnings to stderr on L-MR1 when loading a library that
return true, nil // has symbol versioning.
} firstVersionSupportingRelease := 23
if String(stub.properties.Unversioned_until) == "current" { if String(stub.properties.Unversioned_until) == "current" {
if stub.properties.ApiLevel == "current" { if stub.properties.ApiLevel == "current" {
@ -174,16 +174,31 @@ func shouldUseVersionScript(stub *stubDecorator) (bool, error) {
return true, nil return true, nil
} }
unversionedUntil, err := strconv.Atoi(String(stub.properties.Unversioned_until)) version, err := android.ApiStrToNum(ctx, stub.properties.ApiLevel)
if err != nil { if err != nil {
return true, err return true, err
} }
version, err := strconv.Atoi(stub.properties.ApiLevel) // unversioned_until is normally empty, in which case we use the version
// script as long as we are on a supported API level.
if String(stub.properties.Unversioned_until) == "" {
return version >= firstVersionSupportingRelease, nil
}
unversionedUntil, err := android.ApiStrToNum(ctx, String(stub.properties.Unversioned_until))
if err != nil { if err != nil {
return true, err return true, err
} }
if unversionedUntil < firstVersionSupportingRelease {
return true, fmt.Errorf("unversioned_until must be at least %d",
firstVersionSupportingRelease)
}
if version < firstVersionSupportingRelease {
return false, nil
}
return version >= unversionedUntil, nil return version >= unversionedUntil, nil
} }
@ -318,7 +333,7 @@ func (stub *stubDecorator) linkerFlags(ctx ModuleContext, flags Flags) Flags {
func (stub *stubDecorator) link(ctx ModuleContext, flags Flags, deps PathDeps, func (stub *stubDecorator) link(ctx ModuleContext, flags Flags, deps PathDeps,
objs Objects) android.Path { objs Objects) android.Path {
useVersionScript, err := shouldUseVersionScript(stub) useVersionScript, err := shouldUseVersionScript(ctx, stub)
if err != nil { if err != nil {
ctx.ModuleErrorf(err.Error()) ctx.ModuleErrorf(err.Error())
} }