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

Commit 67acd19e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Include column is_soong_module when loading installed file list" into main

parents d11215c6 5f8fe158

tools/sbom/compliance_metadata.py

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ class MetadataDb: 


  def get_installed_files(self):

    # Get all records from table make_metadata, which contains all installed files and corresponding make modules' metadata

    cursor = self.conn.execute('select installed_file, module_path, is_prebuilt_make_module, product_copy_files, kernel_module_copy_files, is_platform_generated, license_text from make_metadata')

    cursor = self.conn.execute('select installed_file, module_path, is_soong_module, is_prebuilt_make_module, product_copy_files, kernel_module_copy_files, is_platform_generated, license_text from make_metadata')

    rows = cursor.fetchall()

    cursor.close()

    installed_files_metadata = []
@@ -135,7 +135,7 @@ class MetadataDb: 
  def get_installed_file_in_dir(self, dir):

    dir = dir.removesuffix('/')

    cursor = self.conn.execute(

        'select installed_file, module_path, is_prebuilt_make_module, product_copy_files, '

        'select installed_file, module_path, is_soong_module, is_prebuilt_make_module, product_copy_files, '

        '       kernel_module_copy_files, is_platform_generated, license_text '

        'from make_metadata '

        'where installed_file like ?', (dir + '/%',))

tools/sbom/gen_sbom.py

+2 −0
Original line number Diff line number Diff line
@@ -415,11 +415,13 @@ def save_report(report_file_path, report): 
def installed_file_has_metadata(installed_file_metadata, report):

  installed_file = installed_file_metadata['installed_file']

  module_path = installed_file_metadata['module_path']

  is_soong_module = installed_file_metadata['is_soong_module']

  product_copy_files = installed_file_metadata['product_copy_files']

  kernel_module_copy_files = installed_file_metadata['kernel_module_copy_files']

  is_platform_generated = installed_file_metadata['is_platform_generated']



  if (not module_path and

      not is_soong_module and

      not product_copy_files and

      not kernel_module_copy_files and

      not is_platform_generated and