StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Build partition images and SBOM seperately in case the build of SBOM introduces extra dependencies that included in partition images." am: b67dbb23c5 am: 478895321f

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

Change-Id: Iba276bf96fbf0bb19d0b2ee84c215cc3a7a3ba4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wei Li
2023-03-17 06:39:00 +00:00
committed by Automerger Merge Worker
parent aa5993f5fd 478895321f
commit 1db5a5b00e
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tests/sbom_test.sh
View File

@@ -37,13 +37,21 @@ if [ $debug = "true" ]; then
out_dir=out
droid_target=
fi
# m droid
# m droid, build sbom later in case additional dependencies might be built and included in partition images.
TARGET_PRODUCT="aosp_cf_x86_64_phone" TARGET_BUILD_VARIANT=userdebug OUT_DIR=$out_dir \
build/soong/soong_ui.bash --make-mode $droid_target dump.erofs sbom
build/soong/soong_ui.bash --make-mode $droid_target dump.erofs
product_out=$out_dir/target/product/vsoc_x86_64
sbom_test=$product_out/sbom_test
mkdir $sbom_test
cp $product_out/*.img $sbom_test
# m sbom
TARGET_PRODUCT="aosp_cf_x86_64_phone" TARGET_BUILD_VARIANT=userdebug OUT_DIR=$out_dir \
build/soong/soong_ui.bash --make-mode sbom
# Generate installed file list from .img files in PRODUCT_OUT
dump_erofs=$out_dir/host/linux-x86/bin/dump.erofs
product_out=$out_dir/target/product/vsoc_x86_64
declare -A diff_excludes
diff_excludes[odm]="-I /odm/lib/modules"
@@ -142,19 +150,19 @@ diff_excludes[system]=\
# 5388910 2 overlay
# 5479537 2 priv-app
EROFS_IMAGES="\
$product_out/product.img \
$product_out/system.img \
$product_out/system_ext.img \
$product_out/system_dlkm.img \
$product_out/system_other.img \
$product_out/odm.img \
$product_out/odm_dlkm.img \
$product_out/vendor.img \
$product_out/vendor_dlkm.img"
$sbom_test/product.img \
$sbom_test/system.img \
$sbom_test/system_ext.img \
$sbom_test/system_dlkm.img \
$sbom_test/system_other.img \
$sbom_test/odm.img \
$sbom_test/odm_dlkm.img \
$sbom_test/vendor.img \
$sbom_test/vendor_dlkm.img"
for f in $EROFS_IMAGES; do
partition_name=$(basename $f | cut -d. -f1)
file_list_file="${product_out}/sbom-${partition_name}-files.txt"
files_in_spdx_file="${product_out}/sbom-${partition_name}-files-in-spdx.txt"
file_list_file="${sbom_test}/sbom-${partition_name}-files.txt"
files_in_spdx_file="${sbom_test}/sbom-${partition_name}-files-in-spdx.txt"
rm "$file_list_file" > /dev/null 2>&1
all_dirs="/"
while [ ! -z "$all_dirs" ]; do