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

Commit 821cde98 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Change pre-upload hook check order for non python upload" am: e11739d1 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1907792

Change-Id: I7b4770aae73f239220805901f00ac277ca102f03
parents b80830c4 e11739d1

system/tools/scripts/yapf_checker.py

+4 −4
Original line number Diff line number Diff line
@@ -38,10 +38,6 @@ def main(): 
        logging.error('Missing PREUPLOAD_COMMIT in environment.')

        exit(1)



    if ANDROID_BUILD_TOP_KEY not in os.environ:

        logging.error('Missing ANDROID_BUILD_TOP in environment.')

        exit(1)



    # Gather changed Python files

    commit_id = os.environ[COMMIT_ID_ENV_KEY]

    full_git_command = GIT_COMMAND + ['-r', commit_id]
@@ -50,6 +46,10 @@ def main(): 
    if not full_files:

        return



    if ANDROID_BUILD_TOP_KEY not in os.environ:

        logging.error('Missing ANDROID_BUILD_TOP in environment.')

        exit(1)



    # Find yapf in Android code tree

    yapf_dir = os.path.join(os.environ[ANDROID_BUILD_TOP_KEY], DEFAULT_YAPF_DIR)

    yapf_binary = os.path.join(yapf_dir, 'yapf')