Fix some scan_sources.py dependencies

build/scan_sources.py

 #!/usr/bin/python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from optparse import OptionParser
 import os
 import re
 import sys
 
@@ skipping 41 matching lines @@
 
   def open(self, pathname):
     ospath = self.ToNativePath(pathname)
     return open(ospath)
 
   def realpath(self, pathname):
     ospath = self.ToNativePath(pathname)
     ospath = os.path.realpath(ospath)
     return self.ToPosixPath(ospath)
 
+  def dirname(self, pathname):
+    ospath = self.ToNativePath(pathname)
+    ospath = os.path.dirname(ospath)
+    return self.ToPosixPath(ospath)
+
 
 class Resolver(object):
   """Resolver finds and generates relative paths for include files.
 
   The Resolver object provides a mechanism to to find and convert a source or
   include filename into a relative path based on provided search paths.  All
   paths use POSIX style separator.
   """
   def __init__(self, pathobj=PathConverter()):
     self.search_dirs = []
     self.pathobj = pathobj
     self.cwd = self.pathobj.getcwd()
     self.offs = len(self.cwd)
 
   def AddOneDirectory(self, pathname):
     """Add an include search path."""
     pathname = self.pathobj.realpath(pathname)
     DebugPrint('Adding DIR: %s' % pathname)
     if pathname not in self.search_dirs:
       if self.pathobj.isdir(pathname):
         self.search_dirs.append(pathname)
       else:
         sys.stderr.write('Not a directory: %s\n' % pathname)
         return False
     return True
 
+  def RemoveOneDirectory(self, pathname):
+    """Remove an include search path."""
+    pathname = self.pathobj.realpath(pathname)
+    DebugPrint('Removing DIR: %s' % pathname)
+    if pathname in self.search_dirs:
+      self.search_dirs.remove(pathname)
+    return True
+
   def AddDirectories(self, pathlist):
     """Add list of space separated directories."""
     failed = False
     dirlist = ' '.join(pathlist)
     for dirname in dirlist.split(' '):
       if not self.AddOneDirectory(dirname):
         failed = True
     return not failed
 
   def GetDirectories(self):
@@ skipping 93 matching lines @@
     if not self.todo_list:
       return None
     return self.todo_list.pop()
 
   def Run(self):
     """Search through the available dependencies until the list becomes empty.
       The list must be primed with one or more source files to search."""
     scan_name = self.PopIfAvail()
     while scan_name:
       includes = self.scanner.ScanFile(scan_name)
+      # Add the directory of the current scanned file for resolving includes
+      # while processing includes for this file.
+      scan_dir = PathConverter().dirname(scan_name)
+      self.resolver.AddOneDirectory(scan_dir)
       for include_file in includes:
         self.PushIfNew(include_file)
+      self.resolver.RemoveOneDirectory(scan_dir)
       scan_name = self.PopIfAvail()
     return sorted(self.added_set)
 
 
 def DoMain(argv):
   """Entry point used by gyp's pymod_do_main feature."""
   global debug
   parser = OptionParser()
   parser.add_option('-I', dest='includes', action='append',
                     help='Set include path.')
@@ skipping 21 matching lines @@
 
 def Main():
   retcode, result = DoMain(sys.argv[1:])
   if retcode:
     sys.exit(retcode)
   sys.stdout.write(result)
 
 
 if __name__ == '__main__':
   Main()