Merge changes from topic "metalava-sdk-jar"
* changes:
Add private-stub-annotations.jar as core-java lib
Use Metalava based android.jar for SDK
diff --git a/cc/ndk_library.go b/cc/ndk_library.go
index db96325..3bffacd 100644
--- a/cc/ndk_library.go
+++ b/cc/ndk_library.go
@@ -157,10 +157,10 @@
}
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 @@
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