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

Commit 0634397c authored by Wei Li's avatar Wei Li
Browse files

Remove diffs of symlinks in root directory which are included in product SBOMs now. 

Also explicitely ignore some diffs that were ignored because of "-I /bin".

Bug: 272358980
Test: build/soong/tests/sbom_test.sh
Change-Id: I8a19fdaa89c9f6b4a11c107df98bca647323db26
parent 13acefe9

tests/sbom_test.sh

+9 −20
Original line number Diff line number Diff line
@@ -88,24 +88,14 @@ function test_sbom_aosp_cf_x86_64_phone { 
  diff_excludes[vendor]="\

    -I /vendor/lib64/libkeystore2_crypto.so"

  diff_excludes[system]="\

    -I /bin \

    -I /bugreports \

    -I /cache \

    -I /d \

    -I /etc \

    -I /init \

    -I /odm/app \

    -I /odm/bin \

    -I /odm_dlkm/etc \

    -I /odm/etc \

    -I /odm/firmware \

    -I /odm/framework \

    -I /odm/lib \

    -I /odm/lib64 \

    -I /odm/overlay \

    -I /odm/priv-app \

    -I /odm/usr \

    -I /sdcard \

    -I /system/bin/assemble_cvd

    -I /system/bin/console_forwarder

    -I /system/bin/kernel_log_monitor

    -I /system/bin/logcat_receiver

    -I /system/bin/mkenvimage_slim

    -I /system/bin/run_cvd

    -I /system/bin/simg2img

    -I /system/bin/log_tee

    -I /system/lib64/android.hardware.confirmationui@1.0.so \

    -I /system/lib64/android.hardware.confirmationui-V1-ndk.so \

    -I /system/lib64/android.hardware.keymaster@4.1.so \
@@ -133,8 +123,7 @@ function test_sbom_aosp_cf_x86_64_phone { 
    -I /system/lib64/vndk-sp-29 \

    -I /system/lib/vndk-29 \

    -I /system/lib/vndk-sp-29 \

    -I /system/usr/icu \

    -I /vendor_dlkm/etc"

    -I /system/usr/icu"



  # Example output of dump.erofs is as below, and the data used in the test start

  # at line 11. Column 1 is inode id, column 2 is inode type and column 3 is name.