diff options
| author | Jayant Chowdhary <jchowdhary@google.com> | 2017-05-19 12:47:45 -0700 |
|---|---|---|
| committer | Jayant Chowdhary <jchowdhary@google.com> | 2017-05-19 12:51:40 -0700 |
| commit | ce1c0735e1a6cf0d4ba985cf3a7a0d99feeb224c (patch) | |
| tree | 9145308746f31a5cbcc9e8b13e8a681647dd0460 | |
| parent | 85c2d92b58c27b88542e0090eafa0557397d93f0 (diff) | |
| download | build-tools-ce1c0735e1a6cf0d4ba985cf3a7a0d99feeb224c.tar.gz | |
Add merge-abi-diff to merge abi diff reports.
Bug: 38325929
Test: prebuilts/build-tools/build_prebuilts.sh succeeds.
Change-Id: I5523dd99169d6de5c4b48e2674a82247a84e2fc2
| -rwxr-xr-x | build-prebuilts.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build-prebuilts.sh b/build-prebuilts.sh index 4648db0a..e39f6bd9 100755 --- a/build-prebuilts.sh +++ b/build-prebuilts.sh @@ -39,7 +39,7 @@ if [ -n ${build_soong} ]; then } EOF BUILDDIR=${SOONG_OUT} ./bootstrap.bash - SOONG_BINARIES=( acp bpfmt ckati ckati_stamp_dump ijar makeparallel ninja ziptime header-abi-linker header-abi-dumper header-abi-diff) + SOONG_BINARIES=( acp bpfmt ckati ckati_stamp_dump ijar makeparallel ninja ziptime header-abi-linker header-abi-dumper header-abi-diff merge-abi-diff) SOONG_ASAN_BINARIES=( acp ckati ijar makeparallel ninja ziptime ) ${SOONG_OUT}/soong ${SOONG_BINARIES[@]/#/${SOONG_HOST_OUT}/bin/} ${SOONG_HOST_OUT}/nativetest64/ninja_test/ninja_test ${SOONG_HOST_OUT}/nativetest64/ninja_test/ninja_test |