Disabling nacl_win64 targets when building in target_arch!=ia32 mode.

When building on windows with target_arch=x64, we no longer need win32 targets
forced to be 64-bit. This gates out these targets when target_arch!=ia32.
(Prior CL dropped the minimal set to break the dependency between these targets
and the rest of the build. This eliminates them completely.)

BUG=None
TEST=None
R=jschuh@chromium.org,thestig@chromium.org
TBR=darin@chromium.org,abodenha@chromium.org,apatrick@chromium.org,sra@chromium.org,wtc@chromium.org

Review URL: https://chromiumcodereview.appspot.com/11929039

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

1 files changed, 36 insertions, 30 deletions

diff --git a/sandbox/win/sandbox_win.gypi b/sandbox/win/sandbox_win.gypi
index a280442..620a0c0 100644
--- a/sandbox/win/sandbox_win.gypi
+++ b/sandbox/win/sandbox_win.gypi
@@ -200,36 +200,6 @@
       },
     },
     {
-      'target_name': 'sandbox_win64',
-      'type': 'static_library',
-      'variables': {
-        'sandbox_windows_target': 1,
-        'target_arch': 'x64',
-      },
-      'dependencies': [
-        '../testing/gtest.gyp:gtest',
-        '../base/base.gyp:base_nacl_win64',
-        '../base/base.gyp:base_static_win64',
-      ],
-      'configurations': {
-        'Common_Base': {
-          'msvs_target_platform': 'x64',
-        },
-      },
-      'include_dirs': [
-        '../..',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          'src',
-          '../..',
-        ],
-      },
-      'defines': [
-        '<@(nacl_win64_defines)',
-      ]
-    },
-    {
       'target_name': 'sbox_integration_tests',
       'type': 'executable',
       'dependencies': [
@@ -350,4 +320,40 @@
       ],
     },
   ],
+  'conditions': [
+    ['OS=="win" and target_arch=="ia32"', {
+      'targets': [
+        {
+          'target_name': 'sandbox_win64',
+          'type': 'static_library',
+          'variables': {
+            'sandbox_windows_target': 1,
+            'target_arch': 'x64',
+          },
+          'dependencies': [
+            '../testing/gtest.gyp:gtest',
+            '../base/base.gyp:base_nacl_win64',
+            '../base/base.gyp:base_static_win64',
+          ],
+          'configurations': {
+            'Common_Base': {
+              'msvs_target_platform': 'x64',
+            },
+          },
+          'include_dirs': [
+            '../..',
+          ],
+          'direct_dependent_settings': {
+            'include_dirs': [
+              'src',
+              '../..',
+            ],
+          },
+          'defines': [
+            '<@(nacl_win64_defines)',
+          ]
+        },
+      ],
+    }],
+  ],
 }