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

Commit f7c5f647 authored by Wei Li's avatar Wei Li Committed by Automerger Merge Worker
Browse files

Merge "Remove diffs of flags files that included in product SBOM." into main am: 13acefe9 

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



Change-Id: Ie634898b465f7f0b122b00d50fd860153f2365a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 05ed301d 13acefe9

tests/sbom_test.sh

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



  declare -A diff_excludes

  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"

    -I /vendor/lib64/libkeystore2_crypto.so"

  diff_excludes[system]="\

    -I /bin \

    -I /bugreports \
@@ -111,8 +106,6 @@ 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 \
@@ -142,9 +135,6 @@ 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.