Merge "Handle the case when OUT_DIR is not set."

am: dc23131b07

Change-Id: I2922de1e665780db6c4ca65bf837394d637183a8
This commit is contained in:
Sasha Smundak 2019-08-15 18:49:10 -07:00 committed by android-build-merger
commit 9105e8317e

View file

@ -22,4 +22,4 @@ declare -r kzip_count=$(find $OUT_DIR -name '*.kzip' | wc -l)
# Pack
# TODO(asmundak): this should be done by soong.
declare -r allkzip=all.kzip
"$OUT_DIR/soong/host/linux-x86/bin/merge_zips" "$DIST_DIR/$allkzip" @<(find $OUT_DIR -name '*.kzip')
"${OUT_DIR:-out}/soong/host/linux-x86/bin/merge_zips" "$DIST_DIR/$allkzip" @<(find $OUT_DIR -name '*.kzip')