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

Merge "Update run-ckati.sh to use JDK 21" into main am: 16afb50a6a

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

Change-Id: I45d56ca13fbe449aabf6bda36ba5e985f685d87c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-07-18 17:31:43 +00:00
committed by Automerger Merge Worker
parent 037b2e7d27 16afb50a6a
commit 813d92f068
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/run-ckati.sh
View File

@@ -73,12 +73,12 @@ prebuilts/build-tools/linux-x86/bin/ckati \
--writable out/ \
-f build/make/core/main.mk \
"${tracing[@]}" \
ANDROID_JAVA_HOME=prebuilts/jdk/jdk17/linux-x86 \
ANDROID_JAVA_HOME=prebuilts/jdk/jdk21/linux-x86 \
ASAN_SYMBOLIZER_PATH=$PWD/prebuilts/clang/host/linux-x86/llvm-binutils-stable/llvm-symbolizer \
BUILD_DATETIME_FILE="$timestamp_file" \
BUILD_HOSTNAME=$(hostname) \
BUILD_USERNAME="$USER" \
JAVA_HOME=$PWD/prebuilts/jdk/jdk17/linux-x86 \
JAVA_HOME=$PWD/prebuilts/jdk/jdk21/linux-x86 \
KATI_PACKAGE_MK_DIR="{$out}/target/product/${target_device}/CONFIG/kati_packaging" \
OUT_DIR="$out" \
PATH="$PWD/prebuilts/build-tools/path/linux-x86:$PWD/${out}/.path" \