Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6105c42 authored by Wei Li's avatar Wei Li Committed by Automerger Merge Worker
Browse files

Merge "Fix the function invocation which missed the package name." into main... 

Merge "Fix the function invocation which missed the package name." into main am: 35baf405 am: f251d3ec

Original change: https://android-review.googlesource.com/c/platform/build/+/2869634



Change-Id: Ib94a572ed01eb6a2bb4299714f4346352ae045a9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1d6738be f251d3ec

tools/sbom/generate-sbom.py

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ def get_sbom_fragments(installed_file_metadata, metadata_file_path): 
      sbom_checksum = metadata_proto.third_party.sbom_ref.checksum

      upstream_element_id = metadata_proto.third_party.sbom_ref.element_id

      if sbom_url and sbom_checksum and upstream_element_id:

        doc_ref_id = f'DocumentRef-{PKG_UPSTREAM}-{encode_for_spdxid(name)}'

        doc_ref_id = f'DocumentRef-{PKG_UPSTREAM}-{sbom_data.encode_for_spdxid(name)}'

        external_doc_ref = sbom_data.DocumentExternalReference(id=doc_ref_id,

                                                               uri=sbom_url,

                                                               checksum=sbom_checksum)