Merge "flag_check: use project name instead of project path to determine the project" into main (6c865749) · Commits · e / os / android_frameworks_base

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}

+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