diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-07-17 14:40:12 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-07-17 16:49:05 -0700 |
| commit | fc0e3219edc9a5bf81b166e82fd5db2796eb6a0d (patch) | |
| tree | 5fc7f5b941724a62f8e3411df09fae431ff5e3cf /tools | |
| parent | 56d947fbc9bc2992e2f93112fafb73e50d2aaa7a (diff) | |
| download | art-fc0e3219edc9a5bf81b166e82fd5db2796eb6a0d.zip art-fc0e3219edc9a5bf81b166e82fd5db2796eb6a0d.tar.gz art-fc0e3219edc9a5bf81b166e82fd5db2796eb6a0d.tar.bz2 | |
Fix multiple inclusion guards to match new pathnames
Change-Id: Id7735be1d75bc315733b1773fba45c1deb8ace43
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/cpplint.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/cpplint.py b/tools/cpplint.py index ff92d70..30c7128 100755 --- a/tools/cpplint.py +++ b/tools/cpplint.py @@ -726,7 +726,11 @@ class FileInfo: os.path.exists(os.path.join(root_dir, ".hg")) or os.path.exists(os.path.join(root_dir, ".svn"))): prefix = os.path.commonprefix([root_dir, project_dir]) - return fullname[len(prefix) + 1:] + # BEGIN android-changed + # return fullname[len(prefix) + 1:] + return "art/" + fullname[len(prefix) + 1:] + # END android-changed + # Don't know what to do; header guard warnings may be wrong... return fullname @@ -1032,7 +1036,6 @@ def GetHeaderGuardCPPVariable(filename): # Restores original filename in case that cpplint is invoked from Emacs's # flymake. filename = re.sub(r'_flymake\.h$', '.h', filename) - fileinfo = FileInfo(filename) return re.sub(r'[-./\s]', '_', fileinfo.RepositoryName()).upper() + '_' |