In kzip files, compilation unit paths should be relative to top.

Fixes inter-module cross references.

Bug: 137798757
Test: build kzips, verify paths
Change-Id: I5cf64972ae61b869c96aafea5de0a48303d9af83
This commit is contained in:
Sasha Smundak 2020-02-25 11:15:25 -08:00
parent 414d50c35d
commit b8f46cd2d6
2 changed files with 8 additions and 4 deletions

View File

@ -19,16 +19,20 @@ export KYTHE_KZIP_ENCODING
# The extraction might fail for some source files, so run with -k and then check that
# sufficiently many files were generated.
declare -r out="${OUT_DIR:-out}"
# Build extraction files for C++ and Java. Build `merge_zips` which we use later.
build/soong/soong_ui.bash --build-mode --all-modules --dir=$PWD -k merge_zips xref_cxx xref_java
#Build extraction file for Go files in build/soong directory.
# Build extraction file for Go the files in build/{blueprint,soong} directories.
declare -r abspath_out=$(realpath "${out}")
declare -r go_extractor=$(realpath prebuilts/build-tools/linux-x86/bin/go_extractor)
declare -r go_root=$(realpath prebuilts/go/linux-x86)
declare -r vnames_path=$(realpath build/soong/vnames.go.json)
declare -r source_root=$PWD
for dir in blueprint soong; do
(cd "build/$dir";
"$go_extractor" --goroot="$go_root" --rules=vnames.go.json --canonicalize_package_corpus \
--output "${abspath_out}/soong/build_${dir}.go.kzip" ./...
KYTHE_ROOT_DIRECTORY="${source_root}" "$go_extractor" --goroot="$go_root" --rules="${vnames_path}" \
--canonicalize_package_corpus --output "${abspath_out}/soong/build_${dir}.go.kzip" ./...
)
done

View File

@ -3,7 +3,7 @@
"pattern": "(.*)",
"vname": {
"corpus": "android.googlesource.com/platform/superproject",
"path": "build/soong/@1@"
"path": "@1@"
}
}
]