Currently compare_images is built using aosp_arm (the default), but is excuted under aosp_arm64. This change just moves the build step inside of the aosp_arm64 lunch invocation. Test: Ran compare_images_and_print.sh Change-Id: I2e63a4027f6499666d3a199fd9887556af35a361
69 lines
1.3 KiB
Bash
Executable File
69 lines
1.3 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
set -e
|
|
|
|
PROGNAME="$0"
|
|
|
|
function usage {
|
|
cat <<EOF
|
|
Usage:
|
|
${PROGNAME} [OPTION] ... "[Args for compare_images]"
|
|
|
|
Options:
|
|
-h, --help
|
|
Show this message and exit.
|
|
-c, --check
|
|
Exit with a non-zero status if there is any unexpected diffs.
|
|
EOF
|
|
}
|
|
|
|
while [[ "$1" =~ ^- ]] && [[ "$1" != "--" ]]; do
|
|
case "$1" in
|
|
-h | --help)
|
|
usage
|
|
exit 0
|
|
;;
|
|
-c | --check)
|
|
CHECK_DIFF_RESULT=1
|
|
;;
|
|
*)
|
|
break
|
|
;;
|
|
esac
|
|
shift
|
|
done
|
|
if [ "$1" == "--" ]; then
|
|
shift
|
|
fi
|
|
|
|
readonly CHECK_DIFF_RESULT
|
|
|
|
. build/envsetup.sh
|
|
lunch aosp_arm64
|
|
build/soong/soong_ui.bash --make-mode compare_images
|
|
COMMON_WHITELIST=development/vndk/tools/image-diff-tool/whitelist.txt
|
|
out/host/linux-x86/bin/compare_images $1 -u -w "${COMMON_WHITELIST}"
|
|
|
|
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
|
|
|
|
[ERROR] Unexpected diffing files.
|
|
There are diffing files that are not ignored by whitelist.
|
|
The whitelist may need to be updated.
|
|
EOF
|
|
if [ -n "${CHECK_DIFF_RESULT}" ]; then
|
|
exit 1
|
|
fi
|
|
fi
|