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

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

Browse Source 
am: 37ebbdee6c

Change-Id: Icd202a99e39622e9d788763bf819a0d7be5acfad
This commit is contained in:
Ryan Prichard
2018-07-24 17:05:41 -07:00
committed by android-build-merger
parent 6bc5b8320f 37ebbdee6c
commit 81947d241c
1 changed files with 7 additions and 22 deletions
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) { func shouldUseVersionScript(ctx android.BaseContext, stub *stubDecorator) (bool, error) {
// https://github.com/android-ndk/ndk/issues/622 // unversioned_until is normally empty, in which case we should use the version script.
// The loader spews warnings to stderr on L-MR1 when loading a library that if String(stub.properties.Unversioned_until) == "" {
// has symbol versioning. return true, nil
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,29 +174,14 @@ func shouldUseVersionScript(ctx android.BaseContext, stub *stubDecorator) (bool,
return true, nil 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)) 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 { version, err := android.ApiStrToNum(ctx, stub.properties.ApiLevel)
return true, fmt.Errorf("unversioned_until must be at least %d", if err != nil {
firstVersionSupportingRelease) return true, err
}
if version < firstVersionSupportingRelease {
return false, nil
} }
return version >= unversionedUntil, nil return version >= unversionedUntil, nil