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

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

Merge "Improve hiddenapi exclude.sh script" am: b1becf7c am: 8637b71f am:... 

Merge "Improve hiddenapi exclude.sh script" am: b1becf7c am: 8637b71f am: a220ff9b am: f9ea5ff1

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

Change-Id: I58d2d6a3d11fed3fec227de398b0f970ceadf756
parents 022107f0 f9ea5ff1

tools/hiddenapi/exclude.sh

+26 −11
Original line number Diff line number Diff line
@@ -7,11 +7,9 @@ LOCAL_DIR="$( dirname ${BASH_SOURCE} )" 
# the team email to use in the event of this detecting an entry in a <team> package. Also

# add <team> to the TEAMS list. 

LIBCORE_PACKAGES="\

  android.icu \

  android.system \

  android.test \

  com.android.bouncycastle \

  com.android.conscrypt \

  com.android.i18n.phonenumbers \

  com.android.okhttp \

  com.sun \
@@ -24,37 +22,54 @@ LIBCORE_PACKAGES="\ 
  org.json \

  org.w3c.dom \

  org.xml.sax \

  org.xmlpull.v1 \

  sun \

  "

LIBCORE_EMAIL=libcore-team@android.com



I18N_PACKAGES="\

  android.icu \

  "



I18N_EMAIL=$LIBCORE_EMAIL



CONSCRYPT_PACKAGES="\

  com.android.org.conscrypt \

  "



CONSCRYPT_EMAIL=$LIBCORE_EMAIL



# List of teams.

TEAMS=LIBCORE

TEAMS="LIBCORE I18N CONSCRYPT"



SHA=$1



# Generate the list of packages and convert to a regular expression.

PACKAGES=$(for t in $TEAMS; do echo $(eval echo \${${t}_PACKAGES}); done)

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

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

    ENTRIES=$(grep -E "^L(${RE})/" || true <(git show $1:$file))

EXIT_CODE=0

for file in $(git show --name-only --pretty=format: $SHA | grep "config/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 $1 contains the following entries\e[0m"

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

      echo -e "\e[1m\e[31mfor packages that are handled using UnsupportedAppUsage. Please remove\e[0m"

      echo -e "\e[1m\e[31mthese entries and add annotations instead.\e[0m"

      # Partition the entries by team and provide contact details to aid in fixing the issue.

      for t in ${TEAMS}

      do

        PACKAGES=$(eval echo \${${t}_PACKAGES})

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

        TEAM_ENTRIES=$(grep -E "^L(${RE})/" <(echo "${ENTRIES}"))

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

        TEAM_ENTRIES=$(grep -E "^L(${TEAM_RE})/" <(echo "${ENTRIES}") || echo)

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

          EMAIL=$(eval echo \${${t}_EMAIL})

          echo -e "\e[33mContact ${EMAIL} or compat- for help with the following:\e[0m"

          for i in ${ENTRIES}

          echo -e "\e[33mContact ${EMAIL} for help with the following:\e[0m"

          for i in ${TEAM_ENTRIES}

          do

            echo -e "\e[33m  ${i}\e[0m"

          done

        fi

      done

      exit 1

      EXIT_CODE=1

    fi

done

exit $EXIT_CODE