diff options
| author | 2024-06-10 15:16:32 +0000 | |
|---|---|---|
| committer | 2024-06-10 15:16:32 +0000 | |
| commit | 4efad65d81bdb7f35ccae407ccaffcde7f05096a (patch) | |
| tree | c25e51338ea348571757e5c91fc6b4a665e17321 | |
| parent | 93193a6a7601efab4b21b57a1ffa6973a957ab80 (diff) | |
| parent | 6c865749f6e92e52ea7dd3c0748e34c029fd8100 (diff) | |
Merge "flag_check: use project name instead of project path to determine the project" into main am: 6c865749f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3093920
Change-Id: Iec7abbdf0cecb87bc26bb3d845c06584a1fb1679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | PREUPLOAD.cfg | 2 | ||||
| -rwxr-xr-x | packages/SystemUI/flag_check.py | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg index b42f7bc0ca94..624a70833b03 100644 --- a/PREUPLOAD.cfg +++ b/PREUPLOAD.cfg @@ -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} diff --git a/packages/SystemUI/flag_check.py b/packages/SystemUI/flag_check.py index bac3553e7498..a492864b11df 100755 --- a/packages/SystemUI/flag_check.py +++ b/packages/SystemUI/flag_check.py @@ -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 |