Merge "cc_cmake_snapshot: don't hardcode for linux_glibc:x86_64 hosts" into main (c78f8939) · Commits · e / os / android_build_soong

cc/cmake_snapshot.go

+3 −6

Original line number	Diff line number	Diff line
		@@ -268,15 +268,12 @@ func executeTemplate(templ template.Template, buffer bytes.Buffer, data any) s
		}

		func (m *CmakeSnapshot) DepsMutator(ctx android.BottomUpMutatorContext) {
		variations := []blueprint.Variation{
		{"os", "linux_glibc"},
		{"arch", "x86_64"},
		}
		ctx.AddVariationDependencies(variations, cmakeSnapshotModuleTag, m.Properties.Modules...)
		hostVariations := ctx.Config().BuildOSTarget.Variations()
		ctx.AddVariationDependencies(hostVariations, cmakeSnapshotModuleTag, m.Properties.Modules...)

		if len(m.Properties.Prebuilts) > 0 {
		prebuilts := append(m.Properties.Prebuilts, "libc++")
		ctx.AddVariationDependencies(variations, cmakeSnapshotPrebuiltTag, prebuilts...)
		ctx.AddVariationDependencies(hostVariations, cmakeSnapshotPrebuiltTag, prebuilts...)
		}
		}