Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48c3dadc authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Update hiddenapi preupload checks to handle new location" am: ca0501d1 am: 0c71f7c0 

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

Change-Id: I6758e71132e51521c7fa47eb614ae5eebef861f4
parents 96900dc7 0c71f7c0

tools/hiddenapi/checksorted_sha.sh

+1 −1
Original line number Diff line number Diff line 
#!/bin/bash

set -e

LOCAL_DIR="$( dirname ${BASH_SOURCE} )"

git show --name-only --pretty=format: $1 | grep "config/hiddenapi-.*txt" | while read file; do

git show --name-only --pretty=format: $1 | grep "boot/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"

tools/hiddenapi/exclude.sh

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ SHA=$1 
PACKAGES=$(for t in $TEAMS; do echo $(eval echo \${${t}_PACKAGES}); done)

RE=$(echo ${PACKAGES} | sed "s/ /|/g")

EXIT_CODE=0

for file in $(git show --name-only --pretty=format: $SHA | grep "config/hiddenapi-.*txt"); do

for file in $(git show --name-only --pretty=format: $SHA | grep "boot/hiddenapi/hiddenapi-.*txt"); do

    ENTRIES=$(grep -E "^\+L(${RE})/" <(git diff ${SHA}~1 ${SHA} $file) | sed "s|^\+||" || echo)

    if [[ -n "${ENTRIES}" ]]; then

      echo -e "\e[1m\e[31m$file $SHA contains the following entries\e[0m"