Merge "Some small fixes in SBOM generation" into main

    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)

    'SVN',

    'Hg',

    'Darcs',

    'Piper',

    'VCS',

    'Archive',

    'PrebuiltByAlphabet',

        '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: