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

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

Merge "Check for Ignore-AOSP-First commit tag" into sc-dev am: a63e1115 

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

Change-Id: I0592844c01cb3df669bd47f659698b4b7e4bf186
parents ab832129 a63e1115

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; search for files

    count=0