Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28eb2e25 authored by Sasha Smundak's avatar Sasha Smundak Committed by android-build-merger
Browse files

Merge "Handle the case when OUT_DIR is not set." am: dc23131b am: 9105e831... 

Merge "Handle the case when OUT_DIR is not set." am: dc23131b am: 9105e831 am: e5431b0f am: af4f47b1
am: 7f1b23cb

Change-Id: I4a217ad21cbe9cf1430c7f5678584bf31a19c9fd
parents d1f3d635 7f1b23cb

build_kzip.bash

+1 −1
Original line number Diff line number Diff line
@@ -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')