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

Stop versioning NDK stubs pre-M.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

31
cc/ndk_library.go
View File

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