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