From 367944f1c5699ad7980171d5f0de72ca62c724a7 Mon Sep 17 00:00:00 2001
From: Justin Yun <justinyun@google.com>
Date: Mon, 5 Sep 2022 12:06:06 +0900
Subject: [PATCH] Build dist to get build metrics

Include dist target to build the build metrics for the vendor inner
tree build.

Bug: 241033491
Test: development/multitree/build_vendor.sh -d vsoc_x86_64 \
      -p cf_x86_64_phone -r out/dist -i %bid%
Change-Id: I7230fe2ee70eefad5e71cec7d5dc710f74f8c503
---
 multitree/build_vendor.sh | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/multitree/build_vendor.sh b/multitree/build_vendor.sh
index c189baf35..36eeae5c2 100755
--- a/multitree/build_vendor.sh
+++ b/multitree/build_vendor.sh
@@ -49,20 +49,13 @@ fi
 
 export ALLOW_MISSING_DEPENDENCIES=true
 export SKIP_VNDK_VARIANTS_CHECK=true
+export DIST_DIR=$dist_dir
 
-build/soong/soong_ui.bash --make-mode vendorimage collect_ninja_inputs \
+build/soong/soong_ui.bash --make-mode vendorimage collect_ninja_inputs dist \
   TARGET_PRODUCT=$product TARGET_BUILD_VARIANT=userdebug
 
-mkdir -p $dist_dir/soong
-
-for f in out/*.ninja out/soong/build.ninja; do
-  gzip -c $f > $dist_dir/${f#out/}.gz
-done
-
 cp out/target/product/$device/vendor.img $dist_dir
 
-mkdir -p $dist_dir/logs
-
 out/host/linux-x86/bin/collect_ninja_inputs -n prebuilts/build-tools/linux-x86/bin/ninja \
   -f out/combined-$product.ninja -t vendorimage -m $dist_dir/manifest_$build_id.xml \
   --out $dist_dir/logs/ninja_inputs