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

Revert part of "Stop versioning NDK stubs pre-M."

Browse source 
This reverts commit e67144e302.

Keep the getApiLevelsMap function and keep using it in
shouldUseVersionScript. It seems useful. (Also, keeping it probably avoids
an AOSP->internal merge conflict...)

Bug: https://github.com/android-ndk/ndk/issues/750
Test: m out/soong/ndk.timestamp, examine dynsym in stubs
Change-Id: Icbb26fc46a9a1dc99f22af195468f08713c4f216
This commit is contained in:
Ryan Prichard 2018-07-24 12:37:24 -07:00
parent e029b28d97
commit 37ebbdee6c
1 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
cc/ndk_library.go
View file

@ -157,10 +157,10 @@ func getFirstGeneratedVersion(firstSupportedVersion string, platformVersion int)
}
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
// unversioned_until is normally empty, in which case we should use the version script.
if String(stub.properties.Unversioned_until) == "" {
return true, nil
}
if String(stub.properties.Unversioned_until) == "current" {
if stub.properties.ApiLevel == "current" {
@ -174,29 +174,14 @@ func shouldUseVersionScript(ctx android.BaseContext, stub *stubDecorator) (bool,
return true, nil
}
version, err := android.ApiStrToNum(ctx, stub.properties.ApiLevel)
if err != nil {
return true, err
}
// 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
version, err := android.ApiStrToNum(ctx, stub.properties.ApiLevel)
if err != nil {
return true, err
}
return version >= unversionedUntil, nil