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

Commit 4854a7d2 authored by Liz Kammer's avatar Liz Kammer
Browse files

Use fingerprint when min_sdk is current or none 

We have versions of the same apex targetting different min_sdk_versions;
however, fingerprint is overriding the hardcoded min_sdk_version. We
should only be overriding if it is current or unset.

Test: go test apex soong tests
Change-Id: Id030a5ba7d8edebb806ce83d318132fd839a00a5
parent f6840284

apex/apex_test.go

+73 −0
Original line number Diff line number Diff line
@@ -709,6 +709,79 @@ func TestApexManifest(t *testing.T) { 
	}

}



func TestApexManifestMinSdkVersion(t *testing.T) {

	ctx := testApex(t, `

		apex_defaults {

			name: "my_defaults",

			key: "myapex.key",

			product_specific: true,

			file_contexts: ":my-file-contexts",

			updatable: false,

		}

		apex {

			name: "myapex_30",

			min_sdk_version: "30",

			defaults: ["my_defaults"],

		}



		apex {

			name: "myapex_current",

			min_sdk_version: "current",

			defaults: ["my_defaults"],

		}



		apex {

			name: "myapex_none",

			defaults: ["my_defaults"],

		}



		apex_key {

			name: "myapex.key",

			public_key: "testkey.avbpubkey",

			private_key: "testkey.pem",

		}



		filegroup {

			name: "my-file-contexts",

			srcs: ["product_specific_file_contexts"],

		}

	`, withFiles(map[string][]byte{

		"product_specific_file_contexts": nil,

	}), android.FixtureModifyProductVariables(

		func(variables android.FixtureProductVariables) {

			variables.Unbundled_build = proptools.BoolPtr(true)

			variables.Always_use_prebuilt_sdks = proptools.BoolPtr(false)

		}), android.FixtureMergeEnv(map[string]string{

		"UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT": "true",

	}))



	testCases := []struct {

		module        string

		minSdkVersion string

	}{

		{

			module:        "myapex_30",

			minSdkVersion: "30",

		},

		{

			module:        "myapex_current",

			minSdkVersion: "Q.$$(cat out/soong/api_fingerprint.txt)",

		},

		{

			module:        "myapex_none",

			minSdkVersion: "Q.$$(cat out/soong/api_fingerprint.txt)",

		},

	}

	for _, tc := range testCases {

		module := ctx.ModuleForTests(tc.module, "android_common_"+tc.module+"_image")

		args := module.Rule("apexRule").Args

		optFlags := args["opt_flags"]

		if !strings.Contains(optFlags, "--min_sdk_version "+tc.minSdkVersion) {

			t.Errorf("%s: Expected min_sdk_version=%s, got: %s", tc.module, tc.minSdkVersion, optFlags)

		}

	}

}



func TestBasicZipApex(t *testing.T) {

	ctx := testApex(t, `

		apex {

apex/builder.go

+5 −4
Original line number Diff line number Diff line
@@ -602,6 +602,11 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { 
		// codename

		if moduleMinSdkVersion.IsCurrent() || moduleMinSdkVersion.IsNone() {

			minSdkVersion = ctx.Config().DefaultAppTargetSdk(ctx).String()



			if java.UseApiFingerprint(ctx) {

				minSdkVersion = ctx.Config().PlatformSdkCodename() + fmt.Sprintf(".$$(cat %s)", java.ApiFingerprintPath(ctx).String())

				implicitInputs = append(implicitInputs, java.ApiFingerprintPath(ctx))

			}

		}

		// apex module doesn't have a concept of target_sdk_version, hence for the time

		// being targetSdkVersion == default targetSdkVersion of the branch.
@@ -611,10 +616,6 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { 
			targetSdkVersion = ctx.Config().PlatformSdkCodename() + fmt.Sprintf(".$$(cat %s)", java.ApiFingerprintPath(ctx).String())

			implicitInputs = append(implicitInputs, java.ApiFingerprintPath(ctx))

		}

		if java.UseApiFingerprint(ctx) {

			minSdkVersion = ctx.Config().PlatformSdkCodename() + fmt.Sprintf(".$$(cat %s)", java.ApiFingerprintPath(ctx).String())

			implicitInputs = append(implicitInputs, java.ApiFingerprintPath(ctx))

		}

		optFlags = append(optFlags, "--target_sdk_version "+targetSdkVersion)

		optFlags = append(optFlags, "--min_sdk_version "+minSdkVersion)