Merge "Contents validation of override_apex's bootclasspath fragments" into main (39d61f53) · Commits · e / os / android_build_soong

apex/platform_bootclasspath_test.go

+122 −0

Original line number	Diff line number	Diff line
		@@ -791,6 +791,128 @@ func TestNonBootJarInFragment(t *testing.T) {
		`)
		}

		// Skip bcp_fragment content validation of source apexes if prebuilts are active.
		func TestNonBootJarInPrebuilts(t *testing.T) {
		testCases := []struct {
		description string
		selectedApexContributions string
		expectedError string
		}{
		{
		description: "source is active",
		selectedApexContributions: "",
		expectedError: "in contents must also be declared in PRODUCT_APEX_BOOT_JARS",
		},
		{
		description: "prebuilts are active",
		selectedApexContributions: "myapex.prebuilt.contributions",
		expectedError: "", // skip content validation of source bcp fragment
		},
		}
		bp := `
		// Source
		apex {
		name: "myapex",
		key: "myapex.key",
		bootclasspath_fragments: ["apex-fragment"],
		updatable: false,
		min_sdk_version: "29",
		}

		override_apex {
		name: "myapex.override", // overrides the min_sdk_version, thereby creating different variants of its transitive deps
		base: "myapex",
		min_sdk_version: "34",
		}

		apex_key {
		name: "myapex.key",
		public_key: "testkey.avbpubkey",
		private_key: "testkey.pem",
		}

		java_library {
		name: "foo",
		srcs: ["b.java"],
		installable: true,
		apex_available: ["myapex"],
		permitted_packages: ["foo"],
		min_sdk_version: "29",
		}

		java_library {
		name: "bar",
		srcs: ["b.java"],
		installable: true,
		apex_available: ["myapex"],
		permitted_packages: ["bar"],
		min_sdk_version: "29",
		}

		bootclasspath_fragment {
		name: "apex-fragment",
		contents: ["foo", "bar"],
		apex_available:[ "myapex" ],
		hidden_api: {
		split_packages: ["*"],
		},
		}

		platform_bootclasspath {
		name: "myplatform-bootclasspath",
		fragments: [{
		apex: "myapex",
		module:"apex-fragment",
		}],
		}

		// prebuilts
		prebuilt_apex {
		name: "myapex",
		apex_name: "myapex",
		src: "myapex.apex",
		exported_bootclasspath_fragments: ["apex-fragment"],
		}

		prebuilt_bootclasspath_fragment {
		name: "apex-fragment",
		contents: ["foo"],
		hidden_api: {
		annotation_flags: "my-bootclasspath-fragment/annotation-flags.csv",
		metadata: "my-bootclasspath-fragment/metadata.csv",
		index: "my-bootclasspath-fragment/index.csv",
		stub_flags: "my-bootclasspath-fragment/stub-flags.csv",
		all_flags: "my-bootclasspath-fragment/all-flags.csv",
		},
		}
		java_import {
		name: "foo",
		jars: ["foo.jar"],
		}

		apex_contributions {
		name: "myapex.prebuilt.contributions",
		api_domain: "myapex",
		contents: ["prebuilt_myapex"],
		}
		`

		for _, tc := range testCases {
		fixture := android.GroupFixturePreparers(
		prepareForTestWithPlatformBootclasspath,
		PrepareForTestWithApexBuildComponents,
		prepareForTestWithMyapex,
		java.FixtureConfigureApexBootJars("myapex:foo"),
		android.PrepareForTestWithBuildFlag("RELEASE_APEX_CONTRIBUTIONS_ADSERVICES", tc.selectedApexContributions),
		)
		if tc.expectedError != "" {
		fixture = fixture.ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(tc.expectedError))
		}
		fixture.RunTestWithBp(t, bp)
		}

		}

		// Source and prebuilt apex provide different set of boot jars
		func TestNonBootJarMissingInPrebuiltFragment(t *testing.T) {
		bp := `

java/dexpreopt.go

+10 −6

Original line number	Diff line number	Diff line
		@@ -210,17 +210,21 @@ func disableSourceApexVariant(ctx android.BaseModuleContext) bool {
		}
		})
		// Find the apex variant for this module
		_, apexVariantsWithoutTestApexes, _ := android.ListSetDifference(apexInfo.InApexVariants, apexInfo.TestApexes)
		var apexVariantsWithoutTestApexes []string
		if apexInfo.BaseApexName != "" {
		// This is a transitive dependency of an override_apex
		apexVariantsWithoutTestApexes = []string{apexInfo.BaseApexName}
		} else {
		_, apexVariantsWithoutTestApexes, _ = android.ListSetDifference(apexInfo.InApexVariants, apexInfo.TestApexes)
		}
		disableSource := false
		// find the selected apexes
		for _, apexVariant := range apexVariantsWithoutTestApexes {
		for _, selected := range psi.GetSelectedModulesForApiDomain(apexVariant) {
		// If the apex_contribution for this api domain contains a prebuilt apex, disable the source variant
		if strings.HasPrefix(selected, "prebuilt_com.google.android") {
		if len(psi.GetSelectedModulesForApiDomain(apexVariant)) > 0 {
		// If the apex_contribution for this api domain is non-empty, disable the source variant
		disableSource = true
		}
		}
		}
		return disableSource
		}