Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37ebbdee authored by Ryan Prichard's avatar Ryan Prichard
Browse files

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

This reverts commit e67144e3.

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
parent e029b28d

cc/ndk_library.go

+6 −21
Original line number Diff line number Diff line
@@ -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,31 +174,16 @@ func shouldUseVersionScript(ctx android.BaseContext, stub *stubDecorator) (bool, 
		return true, nil

	}



	version, err := android.ApiStrToNum(ctx, stub.properties.ApiLevel)

	unversionedUntil, err := android.ApiStrToNum(ctx, String(stub.properties.Unversioned_until))

	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))

	version, err := android.ApiStrToNum(ctx, stub.properties.ApiLevel)

	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

}