From 8defa640ff3e3771df46733b519e42da36c5b570 Mon Sep 17 00:00:00 2001 From: Kyle Zhang Date: Fri, 10 May 2024 22:13:45 +0000 Subject: [PATCH] Add java path to args of dev_sign_bundle Bug: 339855197 Change-Id: I61d2ea24570857c96fe0b1d273efc5c288386888 (cherry picked from commit 925fa55b4340cc57ced3da52e7d9d4a99ea5405d) --- libwvdrmengine/apex/device/build.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libwvdrmengine/apex/device/build.sh b/libwvdrmengine/apex/device/build.sh index e63c49b9..b58d3f22 100755 --- a/libwvdrmengine/apex/device/build.sh +++ b/libwvdrmengine/apex/device/build.sh @@ -97,7 +97,9 @@ function build_bundles() { # inputs: ${DIST_DIR}/${apex}.aab # outputs: ${DIST_DIR}/dev_keys_signed/${apex}/${apex}.apks function sign_bundles() { - ${DEV_SIGN_BUNDLE} --input_dir "${DIST_DIR}" \ + ${DEV_SIGN_BUNDLE} \ + --java_binary_path "${ANDROID_JAVA_HOME}/bin/java" \ + --input_dir "${DIST_DIR}" \ --output_dir "${DIST_DIR}/dev_keys_signed" } @@ -106,7 +108,7 @@ function configure_build() { # Assign to a variable and eval that, since bash ignores any error status from # the command substitution if it's directly on the eval line. local -r vars="$(TARGET_PRODUCT='' build/soong/soong_ui.bash --dumpvars-mode \ - --vars="TMPDIR OUT_DIR")" + --vars="ANDROID_JAVA_HOME TMPDIR OUT_DIR")" eval "${vars}" declare -gr BUNDLETOOL=${OUT_DIR}/host/linux-x86/bin/bundletool