Fix untrusted.gypi to generate correct list of dependecies

build/scan_sources.py

 #!/usr/bin/python
 # Copyright (c) 2012 The Native Client 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
 
 """Header Scanner.
 
 This module will scan a set of input sources for include dependencies.  Use
 the command-line switch -Ixxxx to add include paths.  All filenames and paths
 are expected and returned with POSIX separators.
 """
@@ skipping 239 matching lines @@
         self.PushIfNew(include_file)
       if added_dir:
         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.')
-  parser.add_option('-D', dest='debug', action='store_true',
-                    help='Enable debugging output.', default=False)
-  (options, files) = parser.parse_args(argv)
-
-  if options.debug:
-    debug = True
 
   resolver = Resolver()
-  if options.includes:
-    if not resolver.AddDirectories(options.includes):
-      return (-1, None)
+  files = []
+
+  arg_type = ''
+  for arg in argv:
+    if arg in ['-I', '-S']:
+      arg_type = arg
+    elif arg == '-D':
+      debug = True
+    elif arg_type == '-I':
+      # Skip generated include directories. These files may not exist and
+      # there should be explicit dependency on the target that generates
+      # these files.
+      if arg.startswith('$!PRODUCT_DIR'):
+        continue
+      resolver.AddDirectories([arg])
+    elif arg_type == '-S':
+      files.append(arg)
 
   workQ = WorkQueue(resolver)
   for filename in files:
     workQ.PushIfNew(filename)
 
   sorted_list = workQ.Run()
   return '\n'.join(sorted_list) + '\n'
 
 
 def Main():
   result = DoMain(sys.argv[1:])
   sys.stdout.write(result)
 
 
 if __name__ == '__main__':
   Main()