diff options
| author | 2025-03-07 23:03:47 -0800 | |
|---|---|---|
| committer | 2025-03-07 23:03:47 -0800 | |
| commit | e33e3daf86e4476e33d4b46a438d4eebd3298ad5 (patch) | |
| tree | 944a90062d99756a70c60f5745f5cf0f92e1b8c7 /filesystem/android_device.go | |
| parent | dd35c86e6f49839c79724dd470351bdd22e59290 (diff) | |
| parent | adf1375a335cb073e3c53679681b915d9f8054df (diff) | |
Merge "Include kernel and dtb.img information in SBOM built in soong-only" into main am: 3639838f5e am: adf1375a33
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3529008
Change-Id: I7129a4cb50eba3a26b6a968c95cac96a95b1c810
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'filesystem/android_device.go')
| -rw-r--r-- | filesystem/android_device.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/filesystem/android_device.go b/filesystem/android_device.go index 6b8af741d..d74200970 100644 --- a/filesystem/android_device.go +++ b/filesystem/android_device.go @@ -294,18 +294,26 @@ func (a *androidDevice) GenerateAndroidBuildActions(ctx android.ModuleContext) { } func buildComplianceMetadata(ctx android.ModuleContext, tags ...blueprint.DependencyTag) { + // Collect metadata from deps filesContained := make([]string, 0) + prebuiltFilesCopied := make([]string, 0) for _, tag := range tags { ctx.VisitDirectDepsProxyWithTag(tag, func(m android.ModuleProxy) { if complianceMetadataInfo, ok := android.OtherModuleProvider(ctx, m, android.ComplianceMetadataProvider); ok { filesContained = append(filesContained, complianceMetadataInfo.GetFilesContained()...) + prebuiltFilesCopied = append(prebuiltFilesCopied, complianceMetadataInfo.GetPrebuiltFilesCopied()...) } }) } - sort.Strings(filesContained) - + // Merge to module's ComplianceMetadataInfo complianceMetadataInfo := ctx.ComplianceMetadataInfo() + filesContained = append(filesContained, complianceMetadataInfo.GetFilesContained()...) + sort.Strings(filesContained) complianceMetadataInfo.SetFilesContained(filesContained) + + prebuiltFilesCopied = append(prebuiltFilesCopied, complianceMetadataInfo.GetPrebuiltFilesCopied()...) + sort.Strings(prebuiltFilesCopied) + complianceMetadataInfo.SetPrebuiltFilesCopied(prebuiltFilesCopied) } // Returns a list of modules that are installed, which are collected from the dependency |