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

Merge "cc_cmake_snapshot: drop Modules field" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-07-09 01:01:44 +00:00
committed by Gerrit Code Review
parent 88af056544 bd83c74485
commit 72be248e10
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cc/cmake_snapshot.go
View File

@@ -69,6 +69,7 @@ var ignoredSystemLibs []string = []string{
"libc", "libc",
"libc++", "libc++",
"libc++_static", "libc++_static",
"libc++demangle",
"libc_musl", "libc_musl",
"libc_musl_crtbegin_so", "libc_musl_crtbegin_so",
"libc_musl_crtbegin_static", "libc_musl_crtbegin_static",
@@ -96,9 +97,6 @@ type LibraryMappingProperty struct {
} }
type CmakeSnapshotProperties struct { type CmakeSnapshotProperties struct {
// TODO: remove
Modules []string
// Host modules to add to the snapshot package. Their dependencies are pulled in automatically. // Host modules to add to the snapshot package. Their dependencies are pulled in automatically.
Modules_host []string Modules_host []string
@@ -289,7 +287,6 @@ func (m *CmakeSnapshot) DepsMutator(ctx android.BottomUpMutatorContext) {
deviceVendorVariations := append(deviceVariations, blueprint.Variation{"image", "vendor"}) deviceVendorVariations := append(deviceVariations, blueprint.Variation{"image", "vendor"})
hostVariations := ctx.Config().BuildOSTarget.Variations() hostVariations := ctx.Config().BuildOSTarget.Variations()
ctx.AddVariationDependencies(hostVariations, cmakeSnapshotModuleTag, m.Properties.Modules...)
ctx.AddVariationDependencies(hostVariations, cmakeSnapshotModuleTag, m.Properties.Modules_host...) ctx.AddVariationDependencies(hostVariations, cmakeSnapshotModuleTag, m.Properties.Modules_host...)
ctx.AddVariationDependencies(deviceSystemVariations, cmakeSnapshotModuleTag, m.Properties.Modules_system...) ctx.AddVariationDependencies(deviceSystemVariations, cmakeSnapshotModuleTag, m.Properties.Modules_system...)
ctx.AddVariationDependencies(deviceVendorVariations, cmakeSnapshotModuleTag, m.Properties.Modules_vendor...) ctx.AddVariationDependencies(deviceVendorVariations, cmakeSnapshotModuleTag, m.Properties.Modules_vendor...)

8
cc/cmake_snapshot_test.go
View File

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