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

Commit 7812fd38 authored by Colin Cross's avatar Colin Cross
Browse files

Fix ChooseSdkVersion after api levels 

I2954bb21c1cfdeb305f25cfb6c8711c930f6ed50 switched normalizeVersions
to work on ApiLevels, which inadvertantly caused it to return "current"
instead of "10000" for libraries that specify "current" in their stubs
property.  ChooseSdkVersion couldn't handle "current" because it was
manually converting the version to an int.  Switch ChooseSdkVersion
to use ApiLevels instead so that it can handle "current".

Test: m checkbuild
Change-Id: Id412359e092483ba419118dd03bc206fae702a96
parent d3e05caa

android/apex.go

+10 −6
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ type ApexModule interface { 
	// Returns the highest version which is <= maxSdkVersion.

	// For example, with maxSdkVersion is 10 and versionList is [9,11]

	// it returns 9 as string

	ChooseSdkVersion(versionList []string, maxSdkVersion int) (string, error)

	ChooseSdkVersion(ctx BaseModuleContext, versionList []string, maxSdkVersion ApiLevel) (string, error)



	// Tests if the module comes from an updatable APEX.

	Updatable() bool
@@ -320,14 +320,18 @@ func (m *ApexModuleBase) DepIsInSameApex(ctx BaseModuleContext, dep Module) bool 
	return true

}



func (m *ApexModuleBase) ChooseSdkVersion(versionList []string, maxSdkVersion int) (string, error) {

func (m *ApexModuleBase) ChooseSdkVersion(ctx BaseModuleContext, versionList []string, maxSdkVersion ApiLevel) (string, error) {

	for i := range versionList {

		ver, _ := strconv.Atoi(versionList[len(versionList)-i-1])

		if ver <= maxSdkVersion {

			return versionList[len(versionList)-i-1], nil

		version := versionList[len(versionList)-i-1]

		ver, err := ApiLevelFromUser(ctx, version)

		if err != nil {

			return "", err

		}

		if ver.LessThanOrEqualTo(maxSdkVersion) {

			return version, nil

		}

	return "", fmt.Errorf("not found a version(<=%d) in versionList: %v", maxSdkVersion, versionList)

	}

	return "", fmt.Errorf("not found a version(<=%s) in versionList: %v", maxSdkVersion, versionList)

}



func (m *ApexModuleBase) checkApexAvailableProperty(mctx BaseModuleContext) {

apex/apex_test.go

+99 −0
Original line number Diff line number Diff line
@@ -836,6 +836,105 @@ func TestApexWithStubs(t *testing.T) { 
	})

}



func TestApexWithStubsWithMinSdkVersion(t *testing.T) {

	t.Parallel()

	ctx, _ := testApex(t, `

		apex {

			name: "myapex",

			key: "myapex.key",

			native_shared_libs: ["mylib", "mylib3"],

			min_sdk_version: "29",

		}



		apex_key {

			name: "myapex.key",

			public_key: "testkey.avbpubkey",

			private_key: "testkey.pem",

		}



		cc_library {

			name: "mylib",

			srcs: ["mylib.cpp"],

			shared_libs: ["mylib2", "mylib3"],

			system_shared_libs: [],

			stl: "none",

			apex_available: [ "myapex" ],

			min_sdk_version: "28",

		}



		cc_library {

			name: "mylib2",

			srcs: ["mylib.cpp"],

			cflags: ["-include mylib.h"],

			system_shared_libs: [],

			stl: "none",

			stubs: {

				versions: ["28", "29", "30", "current"],

			},

			min_sdk_version: "28",

		}



		cc_library {

			name: "mylib3",

			srcs: ["mylib.cpp"],

			shared_libs: ["mylib4"],

			system_shared_libs: [],

			stl: "none",

			stubs: {

				versions: ["28", "29", "30", "current"],

			},

			apex_available: [ "myapex" ],

			min_sdk_version: "28",

		}



		cc_library {

			name: "mylib4",

			srcs: ["mylib.cpp"],

			system_shared_libs: [],

			stl: "none",

			apex_available: [ "myapex" ],

			min_sdk_version: "28",

		}

	`)



	apexRule := ctx.ModuleForTests("myapex", "android_common_myapex_image").Rule("apexRule")

	copyCmds := apexRule.Args["copy_commands"]



	// Ensure that direct non-stubs dep is always included

	ensureContains(t, copyCmds, "image.apex/lib64/mylib.so")



	// Ensure that indirect stubs dep is not included

	ensureNotContains(t, copyCmds, "image.apex/lib64/mylib2.so")



	// Ensure that direct stubs dep is included

	ensureContains(t, copyCmds, "image.apex/lib64/mylib3.so")



	mylibLdFlags := ctx.ModuleForTests("mylib", "android_arm64_armv8-a_shared_apex29").Rule("ld").Args["libFlags"]



	// Ensure that mylib is linking with the version 29 stubs for mylib2

	ensureContains(t, mylibLdFlags, "mylib2/android_arm64_armv8-a_shared_29/mylib2.so")

	// ... and not linking to the non-stub (impl) variant of mylib2

	ensureNotContains(t, mylibLdFlags, "mylib2/android_arm64_armv8-a_shared/mylib2.so")



	// Ensure that mylib is linking with the non-stub (impl) of mylib3 (because mylib3 is in the same apex)

	ensureContains(t, mylibLdFlags, "mylib3/android_arm64_armv8-a_shared_apex29/mylib3.so")

	// .. and not linking to the stubs variant of mylib3

	ensureNotContains(t, mylibLdFlags, "mylib3/android_arm64_armv8-a_shared_29/mylib3.so")



	// Ensure that stubs libs are built without -include flags

	mylib2Cflags := ctx.ModuleForTests("mylib2", "android_arm64_armv8-a_static").Rule("cc").Args["cFlags"]

	ensureNotContains(t, mylib2Cflags, "-include ")



	// Ensure that genstub is invoked with --apex

	ensureContains(t, "--apex", ctx.ModuleForTests("mylib2", "android_arm64_armv8-a_static_29").Rule("genStubSrc").Args["flags"])



	ensureExactContents(t, ctx, "myapex", "android_common_myapex_image", []string{

		"lib64/mylib.so",

		"lib64/mylib3.so",

		"lib64/mylib4.so",

	})

}



func TestApexWithExplicitStubsDependency(t *testing.T) {

	ctx, _ := testApex(t, `

		apex {

cc/cc.go

+2 −2
Original line number Diff line number Diff line
@@ -2465,7 +2465,7 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps { 


				// when to use (unspecified) stubs, check min_sdk_version and choose the right one

				if useThisDep && depIsStubs && !libDepTag.explicitlyVersioned {

					versionToUse, err := c.ChooseSdkVersion(ccDep.StubsVersions(), c.apexSdkVersion.FinalOrFutureInt())

					versionToUse, err := c.ChooseSdkVersion(ctx, ccDep.StubsVersions(), c.apexSdkVersion)

					if err != nil {

						ctx.OtherModuleErrorf(dep, err.Error())

						return
@@ -2488,7 +2488,7 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps { 
						// if this is for use_vendor apex && dep has stubsVersions

						// apply the same rule of apex sdk enforcement to choose right version

						var err error

						versionToUse, err = c.ChooseSdkVersion(versions, c.apexSdkVersion.FinalOrFutureInt())

						versionToUse, err = c.ChooseSdkVersion(ctx, versions, c.apexSdkVersion)

						if err != nil {

							ctx.OtherModuleErrorf(dep, err.Error())

							return