Merge "Output diff result to stderr" am: aa2b5e1a70 am: 536c1f9d63 am: 10865e3bac

Change-Id: I49ba377b53c3e2982310992228b817b36d558801
This commit is contained in:
Automerger Merge Worker
2020-01-07 12:29:21 +00:00

View File

@@ -44,20 +44,17 @@ lunch aosp_arm64
COMMON_WHITELIST=development/vndk/tools/image-diff-tool/whitelist.txt
out/host/linux-x86/bin/compare_images $1 -u -w "${COMMON_WHITELIST}"
echo
echo " - Common parts"
cat common.csv
echo
echo " - Different parts (that are whitelisted)"
cat whitelisted_diff.csv
echo
echo " - Different parts (that are not whitelisted)"
cat diff.csv
if [ -v DIST_DIR ]; then
cp common.csv diff.csv whitelisted_diff.csv "${DIST_DIR}"
fi
echo >&2
echo >&2 " - Different parts (that are whitelisted)"
cat >&2 whitelisted_diff.csv
echo >&2
echo >&2 " - Different parts (that are not whitelisted)"
cat >&2 diff.csv
if [ "$(wc -l diff.csv | cut -d' ' -f1)" -gt "1" ]; then
cat >&2 <<EOF