StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Workaround for b/182183061: generate corpus-specific rule file" am: 0fa5f78714

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0534a3451c427db7de044359995f2b1313e2d4a4
This commit is contained in:
Alexander Smundak
2021-03-09 04:48:18 +00:00
committed by Automerger Merge Worker
parent 500b20e843 0fa5f78714
commit 8035a392ab
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build_kzip.bash
View File

@@ -16,6 +16,7 @@
: ${BUILD_NUMBER:=$(uuidgen)} : ${BUILD_NUMBER:=$(uuidgen)}
: ${KYTHE_JAVA_SOURCE_BATCH_SIZE:=500} : ${KYTHE_JAVA_SOURCE_BATCH_SIZE:=500}
: ${KYTHE_KZIP_ENCODING:=proto} : ${KYTHE_KZIP_ENCODING:=proto}
: ${XREF_CORPUS:?should be set}
export KYTHE_JAVA_SOURCE_BATCH_SIZE KYTHE_KZIP_ENCODING export KYTHE_JAVA_SOURCE_BATCH_SIZE KYTHE_KZIP_ENCODING
# The extraction might fail for some source files, so run with -k and then check that # The extraction might fail for some source files, so run with -k and then check that
@@ -29,11 +30,15 @@ build/soong/soong_ui.bash --build-mode --all-modules --dir=$PWD -k merge_zips xr
declare -r abspath_out=$(realpath "${out}") declare -r abspath_out=$(realpath "${out}")
declare -r go_extractor=$(realpath prebuilts/build-tools/linux-x86/bin/go_extractor) declare -r go_extractor=$(realpath prebuilts/build-tools/linux-x86/bin/go_extractor)
declare -r go_root=$(realpath prebuilts/go/linux-x86) declare -r go_root=$(realpath prebuilts/go/linux-x86)
declare -r vnames_path=$(realpath build/soong/vnames.go.json)
declare -r source_root=$PWD declare -r source_root=$PWD
# TODO(asmundak): Until b/182183061 is fixed, default corpus has to be specified
# in the rules file. Generate this file on the fly with corpus value set from the
# environment variable.
for dir in blueprint soong; do for dir in blueprint soong; do
(cd "build/$dir"; (cd "build/$dir";
KYTHE_ROOT_DIRECTORY="${source_root}" "$go_extractor" --goroot="$go_root" --rules="${vnames_path}" \ KYTHE_ROOT_DIRECTORY="${source_root}" "$go_extractor" --goroot="$go_root" \
--rules=<(printf '[{"pattern": "(.*)","vname": {"path": "@1@", "corpus":"%s"}}]' "${XREF_CORPUS}") \
--canonicalize_package_corpus --output "${abspath_out}/soong/build_${dir}.go.kzip" ./... --canonicalize_package_corpus --output "${abspath_out}/soong/build_${dir}.go.kzip" ./...
) )
done done

8
vnames.go.json
View File

@@ -1,8 +0,0 @@
[
{
"pattern": "(.*)",
"vname": {
"path": "@1@"
}
}
]