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

Commit 1789c06a authored by Brian Egizi's avatar Brian Egizi Committed by Automerger Merge Worker
Browse files

Merge "Prepare kzip script to support superproject sha as an environment... 

Merge "Prepare kzip script to support superproject sha as an environment variable" am: 7c876923 am: 59e1ed35

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697783

Change-Id: I1ea72b30f1ec522ad0c456b1b2aad7743dab4a23
parents 571cd912 59e1ed35

build_kzip.bash

+3 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
# It is assumed that the current directory is the top of the source tree.

# The following environment variables affect the result:

#   BUILD_NUMBER          build number, used to generate unique ID (will use UUID if not set)

#   SUPERPROJECT_SHA      superproject sha, used to generate unique id (will use BUILD_NUMBER if not set)

#   DIST_DIR              where the resulting all.kzip will be placed

#   KYTHE_KZIP_ENCODING   proto or json (proto is default)

#   KYTHE_JAVA_SOURCE_BATCH_SIZE maximum number of the Java source files in a compilation unit
@@ -14,6 +15,7 @@ 
#   XREF_CORPUS           source code repository URI, e.g., 'android.googlesource.com/platform/superproject'



: ${BUILD_NUMBER:=$(uuidgen)}

: ${SUPERPROJECT_SHA:=$BUILD_NUMBER}

: ${KYTHE_JAVA_SOURCE_BATCH_SIZE:=500}

: ${KYTHE_KZIP_ENCODING:=proto}

: ${XREF_CORPUS:?should be set}
@@ -48,6 +50,6 @@ declare -r kzip_count=$(find "$out" -name '*.kzip' | wc -l) 


# Pack

# TODO(asmundak): this should be done by soong.

declare -r allkzip="$BUILD_NUMBER.kzip"

declare -r allkzip="$SUPERPROJECT_SHA.kzip"

"$out/soong/host/linux-x86/bin/merge_zips" "$DIST_DIR/$allkzip" @<(find "$out" -name '*.kzip')