aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevin Moore <devinmoore@google.com>2023-07-12 16:36:53 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-07-12 16:36:53 +0000
commit636f3d938cd1c520089778331173e4e0fcca9514 (patch)
tree5fa922b7017e2cc5464ea02b0c8f5250db4f1195
parent5ee5135be0ad8f5276a8e8d5c179eee09dc41d08 (diff)
parentc13f6bfa45790548c43314db6e51ecc2b5999219 (diff)
downloadrepohooks-636f3d938cd1c520089778331173e4e0fcca9514.tar.gz
aidl_format: Fix `aidl_api` directory exception for aidl_format hook am: c13f6bfa45
Original change: https://android-review.googlesource.com/c/platform/tools/repohooks/+/2654235 Change-Id: I64fde7f799265df3c702867032d89f9b2cf45c58 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--rh/hooks.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rh/hooks.py b/rh/hooks.py
index 457a440..162dd6b 100644
--- a/rh/hooks.py
+++ b/rh/hooks.py
@@ -1012,7 +1012,7 @@ def check_android_test_mapping(project, commit, _desc, diff, options=None):
def check_aidl_format(project, commit, _desc, diff, options=None):
"""Checks that AIDL files are formatted with aidl-format."""
# All *.aidl files except for those under aidl_api directory.
- filtered = _filter_diff(diff, [r'\.aidl$'], [r'/aidl_api/'])
+ filtered = _filter_diff(diff, [r'\.aidl$'], [r'(^|/)aidl_api/'])
if not filtered:
return None
aidl_format = options.tool_path('aidl-format')