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

Merge "cc_cmake_snapshot: Allow selecting modules from system and vendor" into main am: 41dfb90ed0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3150917

Change-Id: I494c5ef59ca3a52352008f596dac9adc021855e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tomasz Wasilczyk
2024-07-02 22:26:32 +00:00
committed by Automerger Merge Worker
parent 8e35f0164d 41dfb90ed0
commit edaf1e6120
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cc/cmake_snapshot.go
View File

@@ -96,9 +96,18 @@ type LibraryMappingProperty struct {
}
type CmakeSnapshotProperties struct {
// Modules to add to the snapshot package. Their dependencies are pulled in automatically.
// TODO: remove
Modules []string
// Host modules to add to the snapshot package. Their dependencies are pulled in automatically.
Modules_host []string
// System modules to add to the snapshot package. Their dependencies are pulled in automatically.
Modules_system []string
// Vendor modules to add to the snapshot package. Their dependencies are pulled in automatically.
Modules_vendor []string
// Host prebuilts to bundle with the snapshot. These are tools needed to build outside Android.
Prebuilts []string
@@ -275,8 +284,15 @@ func executeTemplate(templ *template.Template, buffer *bytes.Buffer, data any) s
}
func (m *CmakeSnapshot) DepsMutator(ctx android.BottomUpMutatorContext) {
deviceVariations := ctx.Config().AndroidFirstDeviceTarget.Variations()
deviceSystemVariations := append(deviceVariations, blueprint.Variation{"image", ""})
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...)
if len(m.Properties.Prebuilts) > 0 {
prebuilts := append(m.Properties.Prebuilts, "libc++")