diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-04-14 18:34:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-14 18:34:43 +0000 |
| commit | b5a78c6a97e411a7d115e16b1dc1ac3e9756bc16 (patch) | |
| tree | 822abe4379d9b3863992ee80a2095214373f549f /tools | |
| parent | 788f2858abf4e0243fb2144a641e4126e7a9dda0 (diff) | |
| parent | 272bf95507879b736d2387d76819c246b7e9f935 (diff) | |
Merge "Generalize tools/hiddenapi/checksorted_sha.sh" am: a48ee296ee am: 44b2f6cebd am: 272bf95507
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675866
Change-Id: Ifde8b21834c3dac0cba363a667f7d94e820e18a2
Diffstat (limited to 'tools')
| -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 |