Merge 199063 "Fix and simplify unbundled v8.gyp:"

> Fix and simplify unbundled v8.gyp:
> 
> - use shim_headers.gypi instead of expanding it inline
> - enable host and target toolsets unconditionally, they're needed
>   as deps (and make no difference anyway)
> 
> BUG=226860
> R=rsleevi@chromium.org
> 
> Review URL: https://codereview.chromium.org/14646033

BUG=239560

TBR=phajdan.jr@chromium.org

Review URL: https://codereview.chromium.org/14773021

git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@199261 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 51 deletions

diff --git a/build/linux/unbundle/v8.gyp b/build/linux/unbundle/v8.gyp
index dce1a16..f7448fe 100644
--- a/build/linux/unbundle/v8.gyp
+++ b/build/linux/unbundle/v8.gyp
@@ -31,53 +31,20 @@
     {
       'target_name': 'v8',
       'type': 'none',
-      'conditions': [
-        ['want_separate_host_toolset==1', {
-          'toolsets': ['host', 'target'],
-        }, {
-          'toolsets': ['target'],
-        }],
-      ],
+      'toolsets': ['host', 'target'],
       'variables': {
-        'shim_headers_path': '<(SHARED_INTERMEDIATE_DIR)/shim_headers/<(_target_name)/<(_toolset)',
-      },
-      'include_dirs++': [
-        '<(shim_headers_path)',
-      ],
-      'all_dependent_settings': {
-        'include_dirs+++': [
-          '<(shim_headers_path)',
+        'headers_root_path': '../../include',
+        'header_filenames': [
+          'v8-debug.h',
+          'v8-preparser.h',
+          'v8-profiler.h',
+          'v8-testing.h',
+          'v8.h',
+          'v8stdint.h',
         ],
       },
-      'actions': [
-        {
-          'variables': {
-            'generator_path': '../../../tools/generate_shim_headers/generate_shim_headers.py',
-            'generator_args': [
-              '--headers-root', '../../include',
-              '--output-directory', '<(shim_headers_path)',
-              'v8-debug.h',
-              'v8-preparser.h',
-              'v8-profiler.h',
-              'v8-testing.h',
-              'v8.h',
-              'v8stdint.h',
-            ],
-          },
-          'action_name': 'generate_<(_target_name)_shim_headers',
-          'inputs': [
-            '<(generator_path)',
-          ],
-          'outputs': [
-            '<!@pymod_do_main(generate_shim_headers <@(generator_args) --outputs)',
-          ],
-          'action': ['python',
-                     '<(generator_path)',
-                     '<@(generator_args)',
-                     '--generate',
-          ],
-          'message': 'Generating <(_target_name) shim headers.',
-        },
+      'includes': [
+        '../../../build/shim_headers.gypi',
       ],
       'link_settings': {
         'libraries': [
@@ -88,13 +55,7 @@
     {
       'target_name': 'v8_shell',
       'type': 'none',
-      'conditions': [
-        ['want_separate_host_toolset==1', {
-          'toolsets': ['host'],
-        }, {
-          'toolsets': ['target'],
-        }],
-      ],
+      'toolsets': ['host', 'target'],
       'dependencies': [
         'v8'
       ],