Merge "cc_cmake_snapshot: drop Modules field" into main (72be248e) · Commits · e / os / android_build_soong

cc/cmake_snapshot.go

+1 −4

Original line number	Diff line number	Diff line
		@@ -69,6 +69,7 @@ var ignoredSystemLibs []string = []string{
		"libc",
		"libc++",
		"libc++_static",
		"libc++demangle",
		"libc_musl",
		"libc_musl_crtbegin_so",
		"libc_musl_crtbegin_static",
		@@ -96,9 +97,6 @@ type LibraryMappingProperty struct {
		}

		type CmakeSnapshotProperties struct {
		// TODO: remove
		Modules []string

		// Host modules to add to the snapshot package. Their dependencies are pulled in automatically.
		Modules_host []string

		@@ -289,7 +287,6 @@ func (m *CmakeSnapshot) DepsMutator(ctx android.BottomUpMutatorContext) {
		deviceVendorVariations := append(deviceVariations, blueprint.Variation{"image", "vendor"})
		hostVariations := ctx.Config().BuildOSTarget.Variations()

		ctx.AddVariationDependencies(hostVariations, cmakeSnapshotModuleTag, m.Properties.Modules...)
		ctx.AddVariationDependencies(hostVariations, cmakeSnapshotModuleTag, m.Properties.Modules_host...)
		ctx.AddVariationDependencies(deviceSystemVariations, cmakeSnapshotModuleTag, m.Properties.Modules_system...)
		ctx.AddVariationDependencies(deviceVendorVariations, cmakeSnapshotModuleTag, m.Properties.Modules_vendor...)

+5 −3

Original line number	Diff line number	Diff line
		@@ -38,7 +38,9 @@ func TestEmptyCmakeSnapshot(t *testing.T) {
		result := PrepareForIntegrationTestWithCc.RunTestWithBp(t, `
		cc_cmake_snapshot {
		name: "foo",
		modules: [],
		modules_host: [],
		modules_system: [],
		modules_vendor: [],
		prebuilts: ["libc++"],
		include_sources: true,
		}`)
		@@ -65,7 +67,7 @@ func TestCmakeSnapshotWithBinary(t *testing.T) {
		result := android.GroupFixturePreparers(PrepareForIntegrationTestWithCc, xtra).RunTestWithBp(t, `
		cc_cmake_snapshot {
		name: "foo",
		modules: [
		modules_system: [
		"foo_binary",
		],
		include_sources: true,
		@@ -99,7 +101,7 @@ func TestCmakeSnapshotAsTestData(t *testing.T) {

		cc_cmake_snapshot {
		name: "foo",
		modules: [],
		modules_system: [],
		prebuilts: ["libc++"],
		include_sources: true,
		}`)