From 1777db0308083dbf21bad1bd9df5b4da27894ebf Mon Sep 17 00:00:00 2001
From: Yi Kong <yikong@google.com>
Date: Thu, 28 Mar 2024 14:26:21 +0900
Subject: [PATCH] Kokoro: build with MLGO

This makes TOT testing closer to production Clang, without adding too
much build time. This also allows dropping in Clang prebuilts from
Kokoro into Android source code for bisection.

Test: N/A
Change-Id: I640c3974d316cf84f3d79f2db5c1907fcb1554f4
---
 kokoro/aosp-master-plus-llvm_build.sh | 2 +-
 kokoro/llvm_build.sh                  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/kokoro/aosp-master-plus-llvm_build.sh b/kokoro/aosp-master-plus-llvm_build.sh
index c31deaee..a030aae7 100755
--- a/kokoro/aosp-master-plus-llvm_build.sh
+++ b/kokoro/aosp-master-plus-llvm_build.sh
@@ -18,6 +18,6 @@ repo sync -c
 
 mkdir dist
 DIST_DIR=dist OUT_DIR=out prebuilts/python/linux-x86/bin/python3 \
-  toolchain/llvm_android/test_compiler.py --build-only --no-mlgo \
+  toolchain/llvm_android/test_compiler.py --build-only \
   --target ${AOSP_BUILD_TARGET}-trunk_staging-userdebug \
   --clang-package-path ${KOKORO_GFILE_DIR} .
diff --git a/kokoro/llvm_build.sh b/kokoro/llvm_build.sh
index af73ee1c..f4052476 100755
--- a/kokoro/llvm_build.sh
+++ b/kokoro/llvm_build.sh
@@ -27,11 +27,13 @@ mkdir -p "${DIST}"
 if [ $LLVM_BUILD_TYPE == "linux-TOT" ]; then
   OUT_DIR="${OUT}" DIST_DIR="${DIST}" $TOP/prebuilts/python/linux-x86/bin/python3 \
   $python_src/build.py --build-llvm-next --create-tar \
+  --mlgo \
   --build-name "${KOKORO_BUILD_NUMBER}" \
   --no-build=windows,lldb
 elif [ $LLVM_BUILD_TYPE == "linux-master" ]; then
   OUT_DIR="${OUT}" DIST_DIR="${DIST}" $TOP/prebuilts/python/linux-x86/bin/python3 \
   $python_src/build.py --create-tar \
+  --mlgo \
   --build-name "${KOKORO_BUILD_NUMBER}" \
   --no-build=windows,lldb
 else