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

Commit 4efad65d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "flag_check: use project name instead of project path to determine the... 

Merge "flag_check: use project name instead of project path to determine the project" into main am: 6c865749

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



Change-Id: Iec7abbdf0cecb87bc26bb3d845c06584a1fb1679
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 93193a6a 6c865749

PREUPLOAD.cfg

+1 −1
Original line number Diff line number Diff line
@@ -30,4 +30,4 @@ ktfmt_hook = ${REPO_ROOT}/external/ktfmt/ktfmt.py --check -i ${REPO_ROOT}/framew 
ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py --no-verify-format -f ${PREUPLOAD_FILES}



# This flag check hook runs only for "packages/SystemUI" subdirectory. If you want to include this check for other subdirectories, please modify flag_check.py.

flag_hook = ${REPO_ROOT}/frameworks/base/packages/SystemUI/flag_check.py --msg=${PREUPLOAD_COMMIT_MESSAGE} --files=${PREUPLOAD_FILES} --project=${REPO_PATH}
 
flag_hook = ${REPO_ROOT}/frameworks/base/packages/SystemUI/flag_check.py --msg=${PREUPLOAD_COMMIT_MESSAGE} --files=${PREUPLOAD_FILES} --project=${REPO_PROJECT}

packages/SystemUI/flag_check.py

+5 −5
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ def main(): 
        nargs='?',

        default='',

        help=

        'REPO_PATH in repo upload to determine whether the check should run for this project.')

        'REPO_PROJECT in repo upload to determine whether the check should run for this project.')



    # Parse the arguments

    args = parser.parse_args()
@@ -108,16 +108,16 @@ def main(): 
    sys.exit(0)





def should_run_path(path, files):

def should_run_path(project, files):

    """Returns a boolean if this check should run with these paths.

    If you want to check for a particular subdirectory under the path,

    add a check here, call should_run_files and check for a specific sub dir path in should_run_files.

    """

    if not path:

    if not project:

        return False

    if path == 'frameworks/base':

    if project == 'platform/frameworks/base':

        return should_run_files(files)

    # Default case, run for all other paths which calls this script.

    # Default case, run for all other projects which calls this script.

    return True