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

Commit 98cd65e1 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Gerrit Code Review
Browse files

Merge changes from topic "ownerz" 

* changes:
  Tweaks to AOSP upload hook logic.
  Upload hook that guides people towards AOSP.
parents 874e10f4 5b471996

PREUPLOAD.cfg

+2 −0
Original line number Diff line number Diff line
@@ -14,3 +14,5 @@ api_lint_hook = ${REPO_ROOT}/frameworks/base/tools/apilint/apilint_sha.sh ${PREU 
strings_lint_hook = ${REPO_ROOT}/frameworks/base/tools/stringslint/stringslint_sha.sh ${PREUPLOAD_COMMIT}



hidden_api_txt_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/checksorted_sha.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}



owners_hook = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} "OWNERS$"

tools/aosp/aosp_sha.sh

0 → 100755
+24 −0
Original line number Diff line number Diff line 
#!/bin/bash

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



if git branch -vv | grep -q -P "^\*[^\[]+\[aosp/"; then

    # Change appears to be in AOSP

    exit 0

else

    # Change appears to be non-AOSP; search for files

    count=0

    while read -r file ; do

        if (( count == 0 )); then

            echo

        fi

        echo -e "\033[0;31mThe source of truth for '$file' is in AOSP.\033[0m"

        (( count++ ))

    done < <(git show --name-only --pretty=format: $1 | grep -- "$2")

    if (( count != 0 )); then

        echo

        echo "If your change contains no confidential details (such as security fixes), please"

        echo "upload and merge this change at https://android-review.googlesource.com/."

        echo

        exit 77

    fi

fi