diff options
| author | 2021-04-14 17:17:50 +0000 | |
|---|---|---|
| committer | 2021-04-14 17:17:50 +0000 | |
| commit | a48ee296ee39cbb003960deb52c8200344971bcd (patch) | |
| tree | 4a858cdc4105ea1b8308b52138b139dbd7f6573c | |
| parent | 2435cbfde712251d46a55f2a74f380e25bb7ef2c (diff) | |
| parent | 11972fd43164415c60a98dd3c0a351decc5a6196 (diff) | |
Merge "Generalize tools/hiddenapi/checksorted_sha.sh"
| -rwxr-xr-x | tools/hiddenapi/checksorted_sha.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/hiddenapi/checksorted_sha.sh b/tools/hiddenapi/checksorted_sha.sh index 451fed6be353..72fb86737488 100755 --- a/tools/hiddenapi/checksorted_sha.sh +++ b/tools/hiddenapi/checksorted_sha.sh @@ -1,10 +1,10 @@ #!/bin/bash set -e LOCAL_DIR="$( dirname ${BASH_SOURCE} )" -git show --name-only --pretty=format: $1 | grep "boot/hiddenapi/hiddenapi-.*txt" | while read file; do +git show --name-only --pretty=format: $1 | grep "hiddenapi/hiddenapi-.*txt" | while read file; do diff <(git show $1:$file) <(git show $1:$file | $LOCAL_DIR/sort_api.sh ) || { echo -e "\e[1m\e[31m$file $1 is not sorted or contains duplicates. To sort it correctly:\e[0m" - echo -e "\e[33m${LOCAL_DIR}/sort_api.sh $2/frameworks/base/$file\e[0m" + echo -e "\e[33m${LOCAL_DIR}/sort_api.sh $PWD/$file\e[0m" exit 1 } done |