Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Generalize tools/hiddenapi/checksorted_sha.sh" am: a48ee296ee am: 44b2f6cebd

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675866

Change-Id: If39e9d7f60ea28fe81ab05763d43337f7f5d7dc9
This commit is contained in:
Paul Duffin
2021-04-14 18:05:38 +00:00
committed by Automerger Merge Worker
parent 6ef49b92d1 44b2f6cebd
commit 272bf95507
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/hiddenapi/checksorted_sha.sh
View File

@@ -1,10 +1,10 @@
#!/bin/bash #!/bin/bash
set -e set -e
LOCAL_DIR="$( dirname ${BASH_SOURCE} )" 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 ) || { 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[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 exit 1
} }
done done