Fix untrusted.gypi to generate correct list of dependecies

build/untrusted.gypi

 # Copyright (c) 2011 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.
 
 {
   'variables': {
     'variables': {
       # Enable -Werror by default, but put it in a variable so it can
       # be optionally disabled.
       'werror%': '-Werror',
@@ skipping 72 matching lines @@
           'extra_deps_newlib32': [],
           'extra_deps_glibc64': [],
           'extra_deps_glibc32': [],
           'include_dirs': ['<(DEPTH)'],
           'defines': [
             '<@(nacl_default_defines)',
             'NACL_BUILD_ARCH=x86',
           ],
           'sources': [],
           'link_flags': [],
-          'get_sources': [
-            'scan_sources',
-            # This is needed to open the .c filenames, which are given
-            # relative to the .gyp file.
-            '-I.',
-            # This is needed to open the .h filenames, which are given
-            # relative to the native_client directory's parent.
-            '-I<(DEPTH)',
-          ],
         },
       },
     }],
     ['target_arch=="arm"', {
       # Common defaults for all ARM nacl-gcc targets
       'target_defaults': {
         'defines': [],
         'sources': [],
         'compile_flags': [],
         'link_flags': [],
@@ skipping 25 matching lines @@
           'tc_lib_dir_irt_arm': '<(SHARED_INTERMEDIATE_DIR)/tc_irt/libarm',
           'tc_include_dir_newlib': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/include',
           'tc_include_dir_bionic': '<(SHARED_INTERMEDIATE_DIR)/tc_bionic/include',
           'include_dirs': ['<(DEPTH)'],
           'defines': [
             '<@(nacl_default_defines)',
             'NACL_BUILD_ARCH=arm',
            ],
            'sources': [],
            'link_flags': [],
-           'get_sources': [
-             'scan_sources',
-             # This is needed to open the .c filenames, which are given
-             # relative to the .gyp file.
-             '-I.',
-             # This is needed to open the .h filenames, which are given
-             # relative to the native_client directory's parent.
-             '-I<(DEPTH)',
-           ],
          },
        },
     }],
     ['target_arch=="mipsel"', {
       # Common defaults for all mips pnacl-clang targets
       'target_defaults': {
         'defines': [],
         'sources': [],
         'compile_flags': [],
         'link_flags': [],
@@ skipping 21 matching lines @@
           'tc_lib_dir_newlib_mips': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libmips',
           'tc_lib_dir_irt_mips': '<(SHARED_INTERMEDIATE_DIR)/tc_irt/libmips',
           'tc_include_dir_newlib': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/include',
           'include_dirs': ['<(DEPTH)'],
           'defines': [
             '<@(nacl_default_defines)',
             'NACL_BUILD_ARCH=mips',
            ],
            'sources': [],
            'link_flags': [],
-           'get_sources': [
-             'scan_sources',
-             # This is needed to open the .c filenames, which are given
-             # relative to the .gyp file.
-             '-I.',
-             # This is needed to open the .h filenames, which are given
-             # relative to the native_client directory's parent.
-             '-I<(DEPTH)',
-           ],
          },
        },
     }],
     ['target_arch=="ia32" or target_arch=="x64"', {
       'target_defaults': {
         # x86-64 newlib nexe action
         'target_conditions': [
            ['nexe_target!="" and build_newlib!=0 and enable_x86_64!=0', {
              'variables': {
                 'tool_name': 'newlib',
                 'out_newlib64%': '<(PRODUCT_DIR)/>(nexe_target)_newlib_x64.nexe',
                 'objdir_newlib64%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-64/>(_target_name)',
              },
              'actions': [
                {
                  'action_name': 'build newlib x86-64 nexe',
                  'variables': {
                    'source_list_newlib64%': '^|(<(tool_name)-x86-64.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                  },
                  'msvs_cygwin_shell': 0,
                  'description': 'building >(out_newlib64)',
                  'inputs': [
                     '<(DEPTH)/native_client/build/build_nexe.py',
-                    '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                    '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                     '>@(extra_deps)',
                     '>@(extra_deps_newlib64)',
                     '^(source_list_newlib64)',
                     '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_x86_newlib/stamp.prep',
                  ],
                  'outputs': ['>(out_newlib64)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 23 matching lines @@
              'actions': [
                {
                  'action_name': 'build newlib x86-64 nlib',
                  'variables': {
                    'source_list_newlib64%': '^|(<(tool_name)-x86-64.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                  },
                  'msvs_cygwin_shell': 0,
                  'description': 'building >(out_newlib64)',
                  'inputs': [
                     '<(DEPTH)/native_client/build/build_nexe.py',
-                    '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                    '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                     '>@(extra_deps)',
                     '>@(extra_deps_newlib64)',
                     '^(source_list_newlib64)',
                     '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_x86_newlib/stamp.prep',
                  ],
                  'outputs': ['>(out_newlib64)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 23 matching lines @@
              'actions': [
                {
                  'action_name': 'build IRT x86-64 nexe',
                  'variables': {
                    'source_list_newlib64%': '^|(<(tool_name)-x86-64.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                  },
                  'msvs_cygwin_shell': 0,
                  'description': 'building >(out_newlib64)',
                  'inputs': [
                     '<(DEPTH)/native_client/build/build_nexe.py',
-                    '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                    '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                     '>@(extra_deps)',
                     '>@(extra_deps_newlib64)',
                     '^(source_list_newlib64)',
                     '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_x86_newlib/stamp.prep',
                     '<(PRODUCT_DIR)/tls_edit<(EXECUTABLE_SUFFIX)',
                  ],
                  'outputs': ['>(out_newlib64)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
@@ skipping 27 matching lines @@
              'actions': [
                {
                  'action_name': 'build irt x86-64 nlib',
                  'variables': {
                    'source_list_newlib64%': '^|(<(tool_name)-x86-64.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                  },
                  'msvs_cygwin_shell': 0,
                  'description': 'building >(out_newlib64)',
                  'inputs': [
                     '<(DEPTH)/native_client/build/build_nexe.py',
-                    '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                    '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                     '>@(extra_deps)',
                     '>@(extra_deps_newlib64)',
                     '^(source_list_newlib64)',
                     '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_x86_newlib/stamp.prep',
                  ],
                  'outputs': ['>(out_newlib64)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 24 matching lines @@
              'actions': [
                {
                  'action_name': 'build newlib x86-32 nexe',
                  'variables': {
                    'source_list_newlib32%': '^|(<(tool_name)-x86-32.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                  },
                  'msvs_cygwin_shell': 0,
                  'description': 'building >(out_newlib32)',
                  'inputs': [
                     '<(DEPTH)/native_client/build/build_nexe.py',
-                    '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                    '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                     '>@(extra_deps)',
                     '>@(extra_deps_newlib32)',
                     '^(source_list_newlib32)',
                     '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_x86_newlib/stamp.prep',
                  ],
                  'outputs': ['>(out_newlib32)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 23 matching lines @@
              'actions': [
                {
                  'action_name': 'build newlib x86-32 nlib',
                  'variables': {
                    'source_list_newlib32%': '^|(<(tool_name)-x86-32.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                  },
                  'msvs_cygwin_shell': 0,
                  'description': 'building >(out_newlib32)',
                  'inputs': [
                     '<(DEPTH)/native_client/build/build_nexe.py',
-                    '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                    '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                     '>@(extra_deps)',
                     '>@(extra_deps_newlib32)',
                     '^(source_list_newlib32)',
                     '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_x86_newlib/stamp.prep',
                  ],
                  'outputs': ['>(out_newlib32)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 23 matching lines @@
              'actions': [
                {
                  'action_name': 'build IRT x86-32 nexe',
                  'variables': {
                    'source_list_newlib32%': '^|(<(tool_name)-x86-32.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                  },
                  'msvs_cygwin_shell': 0,
                  'description': 'building >(out_newlib32)',
                  'inputs': [
                     '<(DEPTH)/native_client/build/build_nexe.py',
-                    '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                    '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                     '>@(extra_deps)',
                     '>@(extra_deps_newlib32)',
                     '^(source_list_newlib32)',
                     '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_x86_newlib/stamp.prep',
                     '<(PRODUCT_DIR)/tls_edit<(EXECUTABLE_SUFFIX)',
                  ],
                  'outputs': ['>(out_newlib32)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
@@ skipping 26 matching lines @@
              'actions': [
                {
                  'action_name': 'build IRT x86-32 nlib',
                  'variables': {
                    'source_list_newlib32%': '^|(<(tool_name)-x86-32.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                  },
                  'msvs_cygwin_shell': 0,
                  'description': 'building >(out_newlib32)',
                  'inputs': [
                     '<(DEPTH)/native_client/build/build_nexe.py',
-                    '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                    '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                     '>@(extra_deps)',
                     '>@(extra_deps_newlib32)',
                     '^(source_list_newlib32)',
                     '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_x86_newlib/stamp.prep',
                  ],
                  'outputs': ['>(out_newlib32)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 29 matching lines @@
             'actions': [
               {
                 'action_name': 'build newlib arm nexe',
                 'variables': {
                   'source_list_newlib_arm%': '^|(<(tool_name)-arm.>(_target_name).source_list.gypcmd ^(_sources) ^(sources) ^(native_sources))',
                 },
                 'msvs_cygwin_shell': 0,
                 'description': 'building >(out_newlib_arm)',
                 'inputs': [
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '>!@pymod_do_main(>(get_sources) >(sources) >(_sources) >(native_sources))',
+                   '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources) >(native_sources))',
                    '>@(extra_deps)',
                    '>@(extra_deps_newlib_arm)',
                    '^(source_list_newlib_arm)',
                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_arm_newlib/stamp.prep',
                 ],
                 'outputs': ['>(out_newlib_arm)'],
                 'action': [
                   'python',
                   '<(DEPTH)/native_client/build/build_nexe.py',
                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 23 matching lines @@
             'actions': [
               {
                 'action_name': 'build newlib arm nlib',
                  'variables': {
                    'source_list_newlib_arm%': '^|(<(tool_name)-arm.>(_target_name).source_list.gypcmd ^(_sources) ^(sources) ^(native_sources))',
                  },
                 'msvs_cygwin_shell': 0,
                 'description': 'building >(out_newlib_arm)',
                 'inputs': [
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '>!@pymod_do_main(>(get_sources) >(sources) >(_sources) >(native_sources))',
+                   '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources) >(native_sources))',
                    '>@(extra_deps)',
                    '>@(extra_deps_newlib_arm)',
                    '^(source_list_newlib_arm)',
                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_arm_newlib/stamp.prep',
                 ],
                 'outputs': ['>(out_newlib_arm)'],
                 'action': [
                   'python',
                   '<(DEPTH)/native_client/build/build_nexe.py',
                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 22 matching lines @@
             'actions': [
               {
                 'action_name': 'build bionic arm nlib',
                  'variables': {
                    'source_list_bionic_arm%': '^|(<(tool_name)-arm.>(_target_name).source_list.gypcmd ^(_sources) ^(sources) ^(native_sources))',
                  },
                 'msvs_cygwin_shell': 0,
                 'description': 'building >(out_bionic_arm)',
                 'inputs': [
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '>!@pymod_do_main(>(get_sources) >(sources) >(_sources) >(native_sources))',
+                   '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources) >(native_sources))',
                    '>@(extra_deps)',
                    '>@(extra_deps_bionic_arm)',
                    '^(source_list_bionic_arm)',
                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86_nacl_arm/nacl_arm_bionic',
                 ],
                 'outputs': ['>(out_bionic_arm)'],
                 'action': [
                   'python',
                   '<(DEPTH)/native_client/build/build_nexe.py',
                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 23 matching lines @@
             'actions': [
               {
                 'action_name': 'build IRT arm nexe',
                 'variables': {
                   'source_list_newlib_arm%': '^|(<(tool_name)-arm.>(_target_name).source_list.gypcmd ^(_sources) ^(sources) ^(native_sources))',
                 },
                 'msvs_cygwin_shell': 0,
                 'description': 'building >(out_newlib_arm)',
                 'inputs': [
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '>!@pymod_do_main(>(get_sources) >(sources) >(_sources) >(native_sources))',
+                   '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources) >(native_sources))',
                    '>@(extra_deps)',
                    '>@(extra_deps_newlib_arm)',
                    '^(source_list_newlib_arm)',
                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_arm_newlib/stamp.prep',
                    '<(PRODUCT_DIR)/tls_edit<(EXECUTABLE_SUFFIX)',
                 ],
                 'outputs': ['>(out_newlib_arm)'],
                 'action': [
                   'python',
                   '<(DEPTH)/native_client/build/build_nexe.py',
@@ skipping 26 matching lines @@
             'actions': [
               {
                 'action_name': 'build IRT arm nlib',
                 'variables': {
                   'source_list_newlib_arm%': '^|(<(tool_name)-arm.>(_target_name).source_list.gypcmd ^(_sources) ^(sources) ^(native_sources))',
                 },
                 'msvs_cygwin_shell': 0,
                 'description': 'building >(out_newlib_arm)',
                 'inputs': [
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '>!@pymod_do_main(>(get_sources) >(sources) >(_sources) >(native_sources))',
+                   '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources) >(native_sources))',
                    '>@(extra_deps)',
                    '>@(extra_deps_newlib_arm)',
                    '^(source_list_newlib_arm)',
                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_arm_newlib/stamp.prep',
                 ],
                 'outputs': ['>(out_newlib_arm)'],
                 'action': [
                   'python',
                   '<(DEPTH)/native_client/build/build_nexe.py',
                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 29 matching lines @@
             'actions': [
               {
                 'action_name': 'build newlib mips nexe',
                 'variables': {
                   'source_list_newlib_mips%': '^|(<(tool_name)-mips.>(_target_name).source_list.gypcmd ^(_sources) ^(sources) ^(native_sources))',
                 },
                 'msvs_cygwin_shell': 0,
                 'description': 'building >(out_newlib_mips)',
                 'inputs': [
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '>!@pymod_do_main(>(get_sources) >(sources) >(_sources) >(native_sources))',
+                   '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources) >(native_sources))',
                    '>@(extra_deps)',
                    '>@(extra_deps_newlib_mips)',
                    '^(source_list_newlib_mips)',
                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/pnacl_newlib/stamp.prep',
                 ],
                 'outputs': ['>(out_newlib_mips)'],
                 'action': [
                   'python',
                   '<(DEPTH)/native_client/build/build_nexe.py',
                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 23 matching lines @@
             'actions': [
               {
                 'action_name': 'build newlib mips nlib',
                 'variables': {
                   'source_list_newlib_mips%': '^|(<(tool_name)-mips.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                 },
                 'msvs_cygwin_shell': 0,
                 'description': 'building >(out_newlib_mips)',
                 'inputs': [
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                   '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                    '>@(extra_deps)',
                    '>@(extra_deps_newlib_mips)',
                    '^(source_list_newlib_mips)',
                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/pnacl_newlib/stamp.prep',
                 ],
                 'outputs': ['>(out_newlib_mips)'],
                 'action': [
                   'python',
                   '<(DEPTH)/native_client/build/build_nexe.py',
                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 23 matching lines @@
             'actions': [
               {
                 'action_name': 'build IRT mips nexe',
                 'variables': {
                   'source_list_newlib_mips%': '^|(<(tool_name)-mips.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                 },
                 'msvs_cygwin_shell': 0,
                 'description': 'building >(out_newlib_mips)',
                 'inputs': [
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                   '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                    '>@(extra_deps)',
                    '>@(extra_deps_newlib_mips)',
                    '^(source_list_newlib_mips)',
                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/pnacl_newlib/stamp.prep',
                    '<(PRODUCT_DIR)/tls_edit<(EXECUTABLE_SUFFIX)',
                 ],
                 'outputs': ['>(out_newlib_mips)'],
                 'action': [
                   'python',
                   '<(DEPTH)/native_client/build/build_nexe.py',
@@ skipping 26 matching lines @@
             'actions': [
               {
                 'action_name': 'build IRT mips nlib',
                 'variables': {
                   'source_list_newlib_mips%': '^|(<(tool_name)-mips.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                 },
                 'msvs_cygwin_shell': 0,
                 'description': 'building >(out_newlib_mips)',
                 'inputs': [
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                   '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                    '>@(extra_deps)',
                    '>@(extra_deps_newlib_mips)',
                    '^(source_list_newlib_mips)',
                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/pnacl_newlib/stamp.prep',
                 ],
                 'outputs': ['>(out_newlib_mips)'],
                 'action': [
                   'python',
                   '<(DEPTH)/native_client/build/build_nexe.py',
                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 29 matching lines @@
              'actions': [
                {
                  'action_name': 'build glibc x86-64 nexe',
                  'variables': {
                    'source_list_glibc64%': '^|(<(tool_name)-x86-64.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                  },
                  'msvs_cygwin_shell': 0,
                  'description': 'building >(out_glibc64)',
                  'inputs': [
                     '<(DEPTH)/native_client/build/build_nexe.py',
-                    '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                    '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                     '>@(extra_deps)',
                     '>@(extra_deps_glibc64)',
                     '^(source_list_glibc64)',
                     '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_x86_glibc/stamp.prep',
                  ],
                  'outputs': ['>(out_glibc64)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 23 matching lines @@
              'actions': [
                {
                  'action_name': 'build glibc x86-32 nexe',
                  'variables': {
                    'source_list_glibc32%': '^|(<(tool_name)-x86-32.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                  },
                  'msvs_cygwin_shell': 0,
                  'description': 'building >(out_glibc32)',
                  'inputs': [
                     '<(DEPTH)/native_client/build/build_nexe.py',
-                    '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                    '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                     '>@(extra_deps)',
                     '>@(extra_deps_glibc32)',
                     '^(source_list_glibc32)',
                     '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_x86_glibc/stamp.prep',
                  ],
                  'outputs': ['>(out_glibc32)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 23 matching lines @@
              'actions': [
                {
                  'action_name': 'build glibc x86-64 nlib',
                  'variables': {
                    'source_list_glibc64%': '^|(<(tool_name)-x86-64.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                  },
                  'msvs_cygwin_shell': 0,
                  'description': 'building >(out_glibc64)',
                  'inputs': [
                     '<(DEPTH)/native_client/build/build_nexe.py',
-                    '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                    '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                     '>@(extra_deps)',
                     '>@(extra_deps_glibc64)',
                     '^(source_list_glibc64)',
                     '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_x86_glibc/stamp.prep',
                  ],
                  'outputs': ['>(out_glibc64)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 23 matching lines @@
              'actions': [
                {
                  'action_name': 'build glibc x86-32 nlib',
                  'variables': {
                    'source_list_glibc32%': '^|(<(tool_name)-x86-32.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                  },
                  'msvs_cygwin_shell': 0,
                  'description': 'building >(out_glibc32)',
                  'inputs': [
                     '<(DEPTH)/native_client/build/build_nexe.py',
-                    '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                    '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                     '>@(extra_deps)',
                     '>@(extra_deps_glibc32)',
                     '^(source_list_glibc32)',
                     '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_x86_glibc/stamp.prep',
                  ],
                  'outputs': ['>(out_glibc32)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 23 matching lines @@
              'actions': [
                {
                  'action_name': 'build glibc x86-64 nso',
                  'variables': {
                    'source_list_glibc64%': '^|(<(tool_name)-x86-64-so.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                  },
                  'msvs_cygwin_shell': 0,
                  'description': 'building >(out_glibc64)',
                  'inputs': [
                     '<(DEPTH)/native_client/build/build_nexe.py',
-                    '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                    '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                     '>@(extra_deps)',
                     '>@(extra_deps_glibc64)',
                     '^(source_list_glibc64)',
                     '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_x86_glibc/stamp.prep',
                  ],
                  'outputs': ['>(out_glibc64)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '>@(extra_args)',
@@ skipping 23 matching lines @@
              'actions': [
                {
                  'action_name': 'build glibc x86-32 nso',
                  'variables': {
                    'source_list_glibc32%': '^|(<(tool_name)-x86-32-so.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                  },
                  'msvs_cygwin_shell': 0,
                  'description': 'building >(out_glibc32)',
                  'inputs': [
                     '<(DEPTH)/native_client/build/build_nexe.py',
-                    '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                    '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                     '>@(extra_deps)',
                     '>@(extra_deps_glibc32)',
                     '^(source_list_glibc32)',
                     '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_x86_glibc/stamp.prep',
                  ],
                  'outputs': ['>(out_glibc32)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '>@(extra_args)',
@@ skipping 87 matching lines @@
          'actions': [
            {
              'action_name': 'build newlib pexe',
              'variables': {
                'source_list_pnacl_newlib%': '^|(<(tool_name).>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
              },
              'msvs_cygwin_shell': 0,
              'description': 'building >(out_pnacl_newlib)',
              'inputs': [
                '<(DEPTH)/native_client/build/build_nexe.py',
-               '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+               '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                '>@(extra_deps)',
                '>@(extra_deps_pnacl_newlib)',
                '^(source_list_pnacl_newlib)',
                '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/pnacl_newlib/stamp.prep',
              ],
              'outputs': ['>(out_pnacl_newlib)'],
              'action': [
                'python',
                '<(DEPTH)/native_client/build/build_nexe.py',
                '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 150 matching lines @@
          'actions': [
            {
              'action_name': 'build newlib plib',
              'variables': {
                'source_list_pnacl_newlib%': '^|(<(tool_name).>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
              },
              'msvs_cygwin_shell': 0,
              'description': 'building >(out_pnacl_newlib)',
              'inputs': [
                '<(DEPTH)/native_client/build/build_nexe.py',
-               '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+               '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                '>@(extra_deps)',
                '>@(extra_deps_pnacl_newlib)',
                '^(source_list_pnacl_newlib)',
                '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/pnacl_newlib/stamp.prep',
              ],
              'outputs': ['>(out_pnacl_newlib)'],
              'action': [
                'python',
                '<(DEPTH)/native_client/build/build_nexe.py',
                '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 28 matching lines @@
             'actions': [
               {
                 'action_name': 'build newlib arm nlib (via pnacl)',
                 'variables': {
                   'source_list_pnacl_newlib_arm%': '^|(<(tool_name).>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                 },
                 'msvs_cygwin_shell': 0,
                 'description': 'building >(out_pnacl_newlib_arm)',
                 'inputs': [
                   '<(DEPTH)/native_client/build/build_nexe.py',
-                  '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                  '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                   '>@(extra_deps)',
                   '>@(extra_deps_pnacl_newlib)',
                   '^(source_list_pnacl_newlib_arm)',
                   '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/pnacl_newlib/stamp.prep'
                 ],
                 'outputs': ['>(out_pnacl_newlib_arm)'],
                 'action': [
                   'python',
                   '<(DEPTH)/native_client/build/build_nexe.py',
                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 29 matching lines @@
              'actions': [
                {
                  'action_name': 'build newlib x86-64 nlib (via pnacl)',
                  'variables': {
                    'source_list_pnacl_newlib_x86_64%': '^|(<(tool_name).>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                  },
                  'msvs_cygwin_shell': 0,
                  'description': 'building >(out_pnacl_newlib_x86_64)',
                  'inputs': [
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                   '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                    '>@(extra_deps)',
                    '>@(extra_deps_pnacl_newlib)',
                    '^(source_list_pnacl_newlib_x86_64)',
                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/pnacl_newlib/stamp.prep'
                  ],
                  'outputs': ['>(out_pnacl_newlib_x86_64)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 24 matching lines @@
              'actions': [
                {
                  'action_name': 'build newlib x86-32 nlib (via pnacl)',
                  'variables': {
                    'source_list_pnacl_newlib_x86_32%': '^|(<(tool_name).>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                  },
                  'msvs_cygwin_shell': 0,
                  'description': 'building >(out_pnacl_newlib_x86_32)',
                  'inputs': [
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                   '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                    '>@(extra_deps)',
                    '>@(extra_deps_pnacl_newlib)',
                    '^(source_list_pnacl_newlib_x86_32)',
                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/pnacl_newlib/stamp.prep'
                  ],
                  'outputs': ['>(out_pnacl_newlib_x86_32)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 28 matching lines @@
              'actions': [
                {
                  'action_name': 'build newlib x86-32-nonsfi nlib (via pnacl)',
                  'variables': {
                    'source_list_pnacl_newlib_x86_32_nonsfi%': '^|(<(tool_name).>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                  },
                  'msvs_cygwin_shell': 0,
                  'description': 'building >(out_pnacl_newlib_x86_32_nonsfi)',
                  'inputs': [
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                   '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                    '>@(extra_deps)',
                    '>@(extra_deps_pnacl_newlib)',
                    '^(source_list_pnacl_newlib_x86_32_nonsfi)',
                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/pnacl_newlib/stamp.prep'
                  ],
                  'outputs': ['>(out_pnacl_newlib_x86_32_nonsfi)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 28 matching lines @@
             'actions': [
               {
                 'action_name': 'build newlib mips nlib (via pnacl)',
                 'variables': {
                   'source_list_pnacl_newlib_mips%': '^|(<(tool_name).>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                 },
                 'msvs_cygwin_shell': 0,
                 'description': 'building >(out_pnacl_newlib_mips)',
                 'inputs': [
                   '<(DEPTH)/native_client/build/build_nexe.py',
-                  '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                  '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                   '>@(extra_deps)',
                   '>@(extra_deps_pnacl_newlib)',
                   '^(source_list_pnacl_newlib_mips)',
                   '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/pnacl_newlib/stamp.prep'
                 ],
                 'outputs': ['>(out_pnacl_newlib_mips)'],
                 'action': [
                   'python',
                   '<(DEPTH)/native_client/build/build_nexe.py',
                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
@@ skipping 12 matching lines @@
                 ],
               },
             ],
           }],
         ],
       }], # end MIPS
       # end pnacl actions for building ABI-biased native libraries
     ], # end conditions for pnacl biased nlib
   },
 }