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

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

Merge "Some small fixes in SBOM generation" into main am: 16b7a942 

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



Change-Id: I427a0eec62a4234c4f3b9e333afbab9ef064af51
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e1f4be17 16b7a942

tools/sbom/compliance_metadata.py

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ class MetadataDb: 
    cursor.close()

    rows = []

    for m in multi_built_file_modules:

      built_files = m['installed_file'].strip().split(' ')

      built_files = m['built_file'].strip().split(' ')

      for f in built_files:

        rows.append((m['module_id'], m['module_name'], m['package'], f))

    self.conn.executemany('insert into module_built_file values (?, ?, ?, ?)', rows)

tools/sbom/gen_sbom.py

+5 −1
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ THIRD_PARTY_IDENTIFIER_TYPES = [ 
    'SVN',

    'Hg',

    'Darcs',

    'Piper',

    'VCS',

    'Archive',

    'PrebuiltByAlphabet',
@@ -708,7 +709,10 @@ def main(): 
        'installed_file': dep_file,

        'is_prebuilt_make_module': False

    }

    file_metadata.update(db.get_soong_module_of_built_file(dep_file))

    soong_module = db.get_soong_module_of_built_file(dep_file)

    if not soong_module:

      continue

    file_metadata.update(soong_module)

    if is_source_package(file_metadata) or is_prebuilt_package(file_metadata):

      add_package_of_file(file_id, file_metadata, doc, report)

    else: