header_usage.sh: Keep leading directory for grep.
Makes the script a bit more accurate in identifying place-holder
header files.
Bug: None
Change-Id: Iba13562aed0d40bffef9c25d7345f3bb8af16c29
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/4381
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20357}diff --git a/rtc_tools/header_usage.sh b/rtc_tools/header_usage.sh
index 58d8502..899b2fc 100755
--- a/rtc_tools/header_usage.sh
+++ b/rtc_tools/header_usage.sh
@@ -16,8 +16,20 @@
#
# Headers close to the top of the list are candidates for removal.
+# If the name includes at most one directory, keep name unchanged,
+# otherwise strip directories. Needed to work with relative #includes
+# which are used in some parts of the tree, while still avoiding,
+# e.g., api/foo.h to match includes of pc/foo.h.
+simplify_name () {
+ if expr "$1" : '.*/.*/' > /dev/null ; then
+ basename "$1"
+ else
+ echo "$1"
+ fi
+}
+
git ls-files '*.h' '*.hpp' | while read header ; do
- name="$(basename "${header}")"
+ name="$(simplify_name "${header}")"
count="$(git grep -l -F "${name}" \
| grep -v -e '\.gn' -e '\.gyp' \
| wc -l)"