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

Commit e8537c5a authored by Seth Moore's avatar Seth Moore Committed by Automerger Merge Worker
Browse files

Merge "Check for Ignore-AOSP-First commit tag" am: d91256af 

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

Change-Id: I4e25a12eb97ff6a93ec91e6c55ad7e64583e73b4
parents 788b42fe d91256af

tools/aosp/aosp_sha.sh

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ LOCAL_DIR="$( dirname "${BASH_SOURCE}" )" 
if git branch -vv | grep -q -P "^\*[^\[]+\[aosp/"; then

    # Change appears to be in AOSP

    exit 0

elif git log -n 1 --format='%B' $1 | grep -q -E "^Ignore-AOSP-First: .+" ; then

    # Change is explicitly marked as ok to skip AOSP

    exit 0

else

    # Change appears to be non-AOSP.