StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "cc_cmake_snapshot: don't hardcode for linux_glibc:x86_64 hosts" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-06-27 20:37:01 +00:00
committed by Gerrit Code Review
parent f58d7efa29 9288b512ce
commit c78f893938
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cc/cmake_snapshot.go
View File

@@ -268,15 +268,12 @@ func executeTemplate(templ *template.Template, buffer *bytes.Buffer, data any) s
} }
func (m *CmakeSnapshot) DepsMutator(ctx android.BottomUpMutatorContext) { func (m *CmakeSnapshot) DepsMutator(ctx android.BottomUpMutatorContext) {
variations := []blueprint.Variation{ hostVariations := ctx.Config().BuildOSTarget.Variations()
{"os", "linux_glibc"}, ctx.AddVariationDependencies(hostVariations, cmakeSnapshotModuleTag, m.Properties.Modules...)
{"arch", "x86_64"},
}
ctx.AddVariationDependencies(variations, cmakeSnapshotModuleTag, m.Properties.Modules...)
if len(m.Properties.Prebuilts) > 0 { if len(m.Properties.Prebuilts) > 0 {
prebuilts := append(m.Properties.Prebuilts, "libc++") prebuilts := append(m.Properties.Prebuilts, "libc++")
ctx.AddVariationDependencies(variations, cmakeSnapshotPrebuiltTag, prebuilts...) ctx.AddVariationDependencies(hostVariations, cmakeSnapshotPrebuiltTag, prebuilts...)
} }
} }