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
This commit is contained in:
Wei Li 2023-08-10 18:13:41 -07:00
parent 13acefe99c
commit 0634397cd8

View file

@ -88,24 +88,14 @@ function test_sbom_aosp_cf_x86_64_phone {
diff_excludes[vendor]="\ diff_excludes[vendor]="\
-I /vendor/lib64/libkeystore2_crypto.so" -I /vendor/lib64/libkeystore2_crypto.so"
diff_excludes[system]="\ diff_excludes[system]="\
-I /bin \ -I /system/bin/assemble_cvd
-I /bugreports \ -I /system/bin/console_forwarder
-I /cache \ -I /system/bin/kernel_log_monitor
-I /d \ -I /system/bin/logcat_receiver
-I /etc \ -I /system/bin/mkenvimage_slim
-I /init \ -I /system/bin/run_cvd
-I /odm/app \ -I /system/bin/simg2img
-I /odm/bin \ -I /system/bin/log_tee
-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/lib64/android.hardware.confirmationui@1.0.so \ -I /system/lib64/android.hardware.confirmationui@1.0.so \
-I /system/lib64/android.hardware.confirmationui-V1-ndk.so \ -I /system/lib64/android.hardware.confirmationui-V1-ndk.so \
-I /system/lib64/android.hardware.keymaster@4.1.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/lib64/vndk-sp-29 \
-I /system/lib/vndk-29 \ -I /system/lib/vndk-29 \
-I /system/lib/vndk-sp-29 \ -I /system/lib/vndk-sp-29 \
-I /system/usr/icu \ -I /system/usr/icu"
-I /vendor_dlkm/etc"
# Example output of dump.erofs is as below, and the data used in the test start # 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. # at line 11. Column 1 is inode id, column 2 is inode type and column 3 is name.