am fc0e3219: Fix multiple inclusion guards to match new pathnames

* commit 'fc0e3219edc9a5bf81b166e82fd5db2796eb6a0d':
  Fix multiple inclusion guards to match new pathnames

1 files changed, 5 insertions, 2 deletions

diff --git a/tools/cpplint.py b/tools/cpplint.py
index ff92d70f06..30c712856e 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() + '_'