widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add java path to args of dev_sign_bundle

Browse Source 
Bug: 339855197
Change-Id: I61d2ea24570857c96fe0b1d273efc5c288386888
(cherry picked from commit 925fa55b4340cc57ced3da52e7d9d4a99ea5405d)
This commit is contained in:
Kyle Zhang
2024-05-10 22:13:45 +00:00
parent c5f6bc0a95
commit 8defa640ff
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libwvdrmengine/apex/device/build.sh
View File

@@ -97,7 +97,9 @@ function build_bundles() {
# inputs: ${DIST_DIR}/${apex}.aab # inputs: ${DIST_DIR}/${apex}.aab
# outputs: ${DIST_DIR}/dev_keys_signed/${apex}/${apex}.apks # outputs: ${DIST_DIR}/dev_keys_signed/${apex}/${apex}.apks
function sign_bundles() { 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" --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 # 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. # the command substitution if it's directly on the eval line.
local -r vars="$(TARGET_PRODUCT='' build/soong/soong_ui.bash --dumpvars-mode \ 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}" eval "${vars}"
declare -gr BUNDLETOOL=${OUT_DIR}/host/linux-x86/bin/bundletool declare -gr BUNDLETOOL=${OUT_DIR}/host/linux-x86/bin/bundletool