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

Commit 21321efc authored by Alexander Smundak's avatar Alexander Smundak Committed by Gerrit Code Review
Browse files

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

parents 40017be1 b8f46cd2
Loading
Loading
Loading
Loading
+7 −3
Original line number Diff line number Diff line
@@ -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

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