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

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

Merge "Fix presubmit for hidden api." am: cde72c67 am: e674eb65

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

Change-Id: I44989e1ccddb235d63f9744cd604fbc86de0791c
parents 7c8edecd e674eb65
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ TEAMS=LIBCORE
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})/" <(git show $1:$file))
    ENTRIES=$(grep -E "^L(${RE})/" || true <(git show $1:$file))
    if [[ -n "${ENTRIES}" ]]; then
      echo -e "\e[1m\e[31m$file $1 contains the following entries\e[0m"
      echo -e "\e[1m\e[31mfor packages that are handled using UnsupportedAppUsage. Please remove\e[0m"