tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change sbom_test.sh to take command line arguments for target product, release and build variant, which is for a corresponding change in CI.

Browse source 
Bug: 276778945
Test: build/soong/tests/sbom_test.sh TARGET_PRODUCT=aosp_cf_x86_64_phone TARGET_RELEASE=trunk_staging TARGET_BUILD_VARIANT=userdebug
Change-Id: I2d9e271e4ae351e3626657aa2ac2a1a967c15fc8
This commit is contained in:
Wei Li 2023-09-29 16:44:12 -07:00
parent faa7c7c102
commit 3b3173d5db
1 changed files with 49 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
tests/sbom_test.sh
View file

@ -35,14 +35,15 @@ function cleanup {
} }
function run_soong { function run_soong {
target_product="$1";shift local out_dir="$1"; shift
out_dir="$1"; shift local targets="$1"; shift
targets="$1"; shift
if [ "$#" -ge 1 ]; then if [ "$#" -ge 1 ]; then
apps=$1; shift local apps=$1; shift
TARGET_PRODUCT="${target_product}" TARGET_BUILD_VARIANT=userdebug OUT_DIR="${out_dir}" TARGET_BUILD_UNBUNDLED=true TARGET_BUILD_APPS=$apps build/soong/soong_ui.bash --make-mode ${targets} TARGET_PRODUCT="${target_product}" TARGET_RELEASE="${target_release}" TARGET_BUILD_VARIANT="${target_build_variant}" OUT_DIR="${out_dir}" TARGET_BUILD_UNBUNDLED=true TARGET_BUILD_APPS=$apps \
build/soong/soong_ui.bash --make-mode ${targets}
else else
TARGET_PRODUCT="${target_product}" TARGET_BUILD_VARIANT=userdebug OUT_DIR="${out_dir}" build/soong/soong_ui.bash --make-mode ${targets} TARGET_PRODUCT="${target_product}" TARGET_RELEASE="${target_release}" TARGET_BUILD_VARIANT="${target_build_variant}" OUT_DIR="${out_dir}" \
build/soong/soong_ui.bash --make-mode ${targets}
fi fi
} }
@ -67,7 +68,7 @@ function test_sbom_aosp_cf_x86_64_phone {
# Test # Test
# m droid, build sbom later in case additional dependencies might be built and included in partition images. # m droid, build sbom later in case additional dependencies might be built and included in partition images.
run_soong "aosp_cf_x86_64_phone" "${out_dir}" "droid dump.erofs lz4" run_soong "${out_dir}" "droid dump.erofs lz4"
product_out=$out_dir/target/product/vsoc_x86_64 product_out=$out_dir/target/product/vsoc_x86_64
sbom_test=$product_out/sbom_test sbom_test=$product_out/sbom_test
@ -75,7 +76,7 @@ function test_sbom_aosp_cf_x86_64_phone {
cp $product_out/*.img $sbom_test cp $product_out/*.img $sbom_test
# m sbom # m sbom
run_soong "aosp_cf_x86_64_phone" "${out_dir}" sbom run_soong "${out_dir}" sbom
# Generate installed file list from .img files in PRODUCT_OUT # Generate installed file list from .img files in PRODUCT_OUT
dump_erofs=$out_dir/host/linux-x86/bin/dump.erofs dump_erofs=$out_dir/host/linux-x86/bin/dump.erofs
@ -217,7 +218,7 @@ function test_sbom_unbundled_apex {
out_dir="$(setup)" out_dir="$(setup)"
# run_soong to build com.android.adbd.apex # run_soong to build com.android.adbd.apex
run_soong "module_arm64" "${out_dir}" "sbom deapexer" "com.android.adbd" run_soong "${out_dir}" "sbom deapexer" "com.android.adbd"
deapexer=${out_dir}/host/linux-x86/bin/deapexer deapexer=${out_dir}/host/linux-x86/bin/deapexer
debugfs=${out_dir}/host/linux-x86/bin/debugfs_static debugfs=${out_dir}/host/linux-x86/bin/debugfs_static
@ -249,7 +250,7 @@ function test_sbom_unbundled_apk {
out_dir="$(setup)" out_dir="$(setup)"
# run_soong to build Browser2.apk # run_soong to build Browser2.apk
run_soong "module_arm64" "${out_dir}" "sbom" "Browser2" run_soong "${out_dir}" "sbom" "Browser2"
sbom_file=${out_dir}/target/product/module_arm64/system/product/app/Browser2/Browser2.apk.spdx.json sbom_file=${out_dir}/target/product/module_arm64/system/product/app/Browser2/Browser2.apk.spdx.json
echo "============ Diffing files in Browser2.apk and SBOM" echo "============ Diffing files in Browser2.apk and SBOM"
@ -271,6 +272,41 @@ function test_sbom_unbundled_apk {
cleanup "${out_dir}" cleanup "${out_dir}"
} }
test_sbom_aosp_cf_x86_64_phone target_product=aosp_cf_x86_64_phone
test_sbom_unbundled_apex target_release=trunk_staging
test_sbom_unbundled_apk target_build_variant=userdebug
for i in "$@"; do
case $i in
TARGET_PRODUCT=*)
target_product=${i#*=}
shift
;;
TARGET_RELEASE=*)
target_release=${i#*=}
shift
;;
TARGET_BUILD_VARIANT=*)
target_build_variant=${i#*=}
shift
;;
*)
echo "Unknown command line arguments: $i"
exit 1
;;
esac
done
echo "target product: $target_product, target_release: $target_release, target build variant: $target_build_variant"
case $target_product in
aosp_cf_x86_64_phone)
test_sbom_aosp_cf_x86_64_phone
;;
module_arm64)
test_sbom_unbundled_apex
test_sbom_unbundled_apk
;;
*)
echo "Unknown TARGET_PRODUCT: $target_product"
exit 1
;;
esac