Merge "Ignore some new files added to partition images in sbom_test.sh." into main (e4d58523) · Commits · e / os / android_build_soong

tests/sbom_test.sh

+12 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,13 @@ function test_sbom_aosp_cf_x86_64_phone {
		lz4=$out_dir/host/linux-x86/bin/lz4

		declare -A diff_excludes
		diff_excludes[vendor]="-I /vendor/lib64/libkeystore2_crypto.so"
		diff_excludes[product]="\
		-I /product/etc/aconfig_flags.textproto \
		-I /product/etc/build_flags.json"
		diff_excludes[vendor]="\
		-I /vendor/lib64/libkeystore2_crypto.so \
		-I /vendor/etc/aconfig_flags.textproto \
		-I /vendor/etc/build_flags.json"
		diff_excludes[system]="\
		-I /bin \
		-I /bugreports \
		@@ -105,6 +111,8 @@ function test_sbom_aosp_cf_x86_64_phone {
		-I /odm/priv-app \
		-I /odm/usr \
		-I /sdcard \
		-I /system/etc/aconfig_flags.textproto \
		-I /system/etc/build_flags.json \
		-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 \
		@@ -134,6 +142,9 @@ function test_sbom_aosp_cf_x86_64_phone {
		-I /system/lib/vndk-sp-29 \
		-I /system/usr/icu \
		-I /vendor_dlkm/etc"
		diff_excludes[system_ext]="\
		-I /system_ext/etc/aconfig_flags.textproto \
		-I /system_ext/etc/build_flags.json"

		# 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.