Revert 108116 - Use GYP to build nacl_irt

Converts Chrome from using scons to using GYP when building nacl_irt.
This change causes chrome to use GYP based components for untrusted
code.  As a benifit, GYP will no longer need to run and scrape scons
output to determine irt dependencies.  This also allows us to avoid
invoking scons during the build process.
We roll NaCl deps to get a fix for a simultaneous 32/64 bit build
issue on Windows.

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

TBR=noelallen@google.com
Review URL: http://codereview.chromium.org/8440003

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

1 files changed, 74 insertions, 11 deletions

diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi
index bd1a272..0e717b8 100644
--- a/chrome/nacl.gypi
+++ b/chrome/nacl.gypi
@@ -3,12 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'variables': {
-    'disable_untrusted%': 0
-  },
-  'includes': [
-    '../native_client/build/untrusted.gypi',
-  ],
   'target_defaults': {
     'variables': {
       'nacl_target': 0,
@@ -68,15 +62,16 @@
           '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': [
-            # TODO(gregoryd): chrome_resources and chrome_strings could be
-            # shared with the 64-bit target, but it does not work due to a gyp
-            #issue
             'chrome_resources',
             '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',
@@ -89,6 +84,74 @@
               '<@(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': [