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

Commit 9d38ce97 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Check if an installed file exists and report error if not." am: 0bbde417 

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



Change-Id: Id2cea3cfa9d23671c659070bd505005b254b170d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ac31a9ee 0bbde417

tools/generate-sbom.py

+11 −5
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ ISSUE_NO_METADATA = 'No metadata generated in Make for installed files:' 
ISSUE_NO_METADATA_FILE = 'No METADATA file found for installed file:'

ISSUE_METADATA_FILE_INCOMPLETE = 'METADATA file incomplete:'

ISSUE_UNKNOWN_SECURITY_TAG_TYPE = 'Unknown security tag type:'

ISSUE_INSTALLED_FILE_NOT_EXIST = 'Non-exist installed files:'

INFO_METADATA_FOUND_FOR_PACKAGE = 'METADATA file found for packages:'
@@ -601,7 +602,8 @@ def main(): 
    ISSUE_NO_METADATA_FILE: [],

    ISSUE_METADATA_FILE_INCOMPLETE: [],

    ISSUE_UNKNOWN_SECURITY_TAG_TYPE: [],

      INFO_METADATA_FOUND_FOR_PACKAGE: []

    ISSUE_INSTALLED_FILE_NOT_EXIST: [],

    INFO_METADATA_FOUND_FOR_PACKAGE: [],

  }



  # Scan the metadata in CSV file and create the corresponding package and file records in SPDX
@@ -619,6 +621,10 @@ def main(): 


      if not installed_file_has_metadata(installed_file_metadata, report):

        continue

      file_path = args.product_out_dir + '/' + installed_file

      if not (os.path.islink(file_path) or os.path.isfile(file_path)):

        report[ISSUE_INSTALLED_FILE_NOT_EXIST].append(installed_file)

        continue



      file_id = new_file_id(installed_file)

      product_files.append(new_file_record(file_id, installed_file, checksum(installed_file)))