Skip to content

Commit 4bcb2cc

Browse files
committed
fix: avoid empty packaging arg
* fails on A7
1 parent 672c3ec commit 4bcb2cc

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

scripts/packaging.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,13 @@ _packaging() {
4040
if [[ "${ANDROID_VERSION}" -lt 11 ]]; then
4141
releasetools_prefix="${ANDROID_BUILD_TOP}"/build/tools/releasetools/
4242
fi
43+
44+
local releasetool_flags=(-k "${KEYS_DIR}"/releasekey)
45+
if [[ -n "${RELEASETOOL_EXTRA_FLAGS}" ]]; then
46+
releasetool_flags=("${releasetool_flags[@]}" "${RELEASETOOL_EXTRA_FLAGS}")
47+
fi
4348
set +eu
44-
if ! "${releasetools_prefix}"ota_from_target_files "${RELEASETOOL_EXTRA_FLAGS}" -k "${KEYS_DIR}"/releasekey \
49+
if ! "${releasetools_prefix}"ota_from_target_files "${releasetool_flags[@]}" \
4550
"${OUT}"/signed-target_files.zip \
4651
"${OUT}"/"${PACKAGE_NAME}" 2>&1 | tee --append "${LOGS_DIR}"/"${BUILD_DATE}"/packaging.txt
4752
then

0 commit comments

Comments
 (0)