Enable untrusted GYP builds in Chrome (irt via gyp)

Reconstruct of CL to enable untrsuted builds see:
  http://codereview.chromium.org/8416025.

This CL will enable untrusted builds in Chrome.  The first step
is to enable enable building the IRT via this technique instead
of using scons.

DEPS:
  We bump NaCl deps to fix untrusted.gypi in NaCl Repo

ppapi/ppapi_cpp.gypi+
  Add ppapi_cpp library for NEXE

ppapi/native_client/native_client.gyp
  Add ppapi library for NEXE (copy linker script to toolchain dir)
  Add nacl_irt target (the actual IRT.NEXE)

ppapi/ppapi.gyp & ppapi/ppapi_internal.gyp
  Pull in untrusted.gypi from NaCl repo

ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp
  Add ppruntime library for NEXE

chrome/nacl.gypi
  Remove scons header scan and scons irt build
  Add dependency to untrusted IRT build in native_client.gyp


BUG= http://code.google.com/p/chromium/issues/detail?id=96782
TEST= try
TBR=dmichael@chromium.org
Review URL: http://codereview.chromium.org/8502036

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109739 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 73 deletions

diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi
index 3474b2d..83bd431 100644
--- a/chrome/nacl.gypi
+++ b/chrome/nacl.gypi
@@ -3,6 +3,9 @@
 # found in the LICENSE file.
 
 {
+  'include': [
+    '../native_client/build/untrusted.gypi',
+  ],
   'target_defaults': {
     'variables': {
       'nacl_target': 0,
@@ -62,16 +65,12 @@
           'type': 'static_library',
           'variables': {
             'nacl_target': 1,
-            'irt_build_cmd': [
-              'python', 'build_nacl_irt.py', '--outdir', '<(PRODUCT_DIR)',
-            ],
-            'irt_inputs_cmd':
-                'python build_nacl_irt.py --inputs',
           },
           'dependencies': [
             'chrome_resources.gyp:chrome_resources',
             'chrome_resources.gyp:chrome_strings',
             'common',
+            '../ppapi/native_client/native_client.gyp:nacl_irt',
             '../webkit/support/webkit_support.gyp:glue',
             '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPluginChrome',
             '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel',
@@ -84,74 +83,6 @@
               '<@(nacl_defines)',
             ],
           },
-          'conditions': [
-            ['OS=="win"', {
-              # Windows needs both the x86-32 and x86-64 IRT.
-              'actions': [
-                {
-                  'action_name': 'nacl_irt',
-                  'message': 'Building NaCl IRT',
-                  'inputs': [
-                    '<!@(<(irt_inputs_cmd) --platform=x86-32 --platform=x86-64)',
-                  ],
-                  'outputs': ['<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
-                              '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe'],
-                  'action': [
-                    '<@(irt_build_cmd)',
-                    '--platform', 'x86-32',
-                    '--platform', 'x86-64',
-                  ],
-                },
-              ],
-            }],
-            ['OS!="win" and target_arch=="ia32"', {
-              # Linux-x86-32 and OSX need only the x86-32 IRT.
-              'actions': [
-                {
-                  'action_name': 'nacl_irt',
-                  'message': 'Building NaCl IRT',
-                  'inputs': [
-                    '<!@(<(irt_inputs_cmd) --platform=x86-32)',
-                  ],
-                  'outputs': ['<(PRODUCT_DIR)/nacl_irt_x86_32.nexe'],
-                  'action': [
-                    '<@(irt_build_cmd)', '--platform', 'x86-32',
-                  ],
-                },
-              ],
-            }],
-            ['OS!="win" and target_arch=="x64"', {
-              # Linux-x86-64 needs only the x86-64 IRT.
-              'actions': [
-                {
-                  'action_name': 'nacl_irt',
-                  'message': 'Building NaCl IRT',
-                  'inputs': [
-                    '<!@(<(irt_inputs_cmd) --platform=x86-64)',
-                  ],
-                  'outputs': ['<(PRODUCT_DIR)/nacl_irt_x86_64.nexe'],
-                  'action': [
-                    '<@(irt_build_cmd)', '--platform', 'x86-64',
-                  ],
-                },
-              ],
-            }],
-            ['OS!="win" and target_arch=="arm"', {
-              'actions': [
-                {
-                  'action_name': 'nacl_irt',
-                  'message': 'Building NaCl IRT',
-                  'inputs': [
-                    '<!@(<(irt_inputs_cmd) --platform=arm)',
-                  ],
-                  'outputs': ['<(PRODUCT_DIR)/nacl_irt_arm.nexe'],
-                  'action': [
-                    '<@(irt_build_cmd)', '--platform', 'arm',
-                  ],
-                },
-              ],
-            }],
-          ],
         },
       ],
       'conditions': [