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

18 files changed, 168 insertions, 130 deletions

diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index 46861ec..78aa7aa 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -546,6 +546,27 @@
           ],
         },
         {
+          'target_name': 'tcmalloc_unittest',
+          'type': 'executable',
+          'sources': [
+            'tcmalloc_unittest.cc',
+          ],
+          'include_dirs': [
+            '../..',
+            # For constants of TCMalloc.
+            '<(tcmalloc_dir)/src',
+          ],
+          'dependencies': [
+            '../../testing/gtest.gyp:gtest',
+            '../base.gyp:base',
+            'allocator',
+          ],
+        },
+      ],
+    }],
+    ['OS=="win" and target_arch=="ia32"', {
+      'targets': [
+        {
           'target_name': 'allocator_extension_thunks_win64',
           'type': 'static_library',
           'sources': [
@@ -562,23 +583,6 @@
             },
           },
         },
-      {
-        'target_name': 'tcmalloc_unittest',
-        'type': 'executable',
-        'sources': [
-          'tcmalloc_unittest.cc',
-        ],
-        'include_dirs': [
-          '../..',
-          # For constants of TCMalloc.
-          '<(tcmalloc_dir)/src',
-        ],
-        'dependencies': [
-          '../../testing/gtest.gyp:gtest',
-          '../base.gyp:base',
-          'allocator',
-        ],
-      },
       ],
     }],
     ['OS=="linux" and clang_type_profiler==1', {
diff --git a/base/base.gyp b/base/base.gyp
index f3ffb9e..48e0f50 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -389,37 +389,6 @@
         '..',
       ],
     },
-    {
-      # TODO(rvargas): Remove this when gyp finally supports a clean model.
-      # See bug 36232.
-      'target_name': 'base_static_win64',
-      'type': 'static_library',
-      'sources': [
-        'base_switches.cc',
-        'base_switches.h',
-        'win/pe_image.cc',
-        'win/pe_image.h',
-      ],
-      'sources!': [
-        # base64.cc depends on modp_b64.
-        'base64.cc',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'configurations': {
-        'Common_Base': {
-          'msvs_target_platform': 'x64',
-        },
-      },
-      'defines': [
-        'NACL_WIN64',
-      ],
-      # TODO(rvargas): Bug 78117. Remove this.
-      'msvs_disabled_warnings': [
-        4244,
-      ],
-    },
     # Include this target for a main() function that simply instantiates
     # and runs a base::TestSuite.
     {
@@ -920,7 +889,7 @@
         },
       ],
     }],
-    ['OS == "win"', {
+    ['OS == "win" and target_arch=="ia32"', {
       'targets': [
         {
           'target_name': 'base_nacl_win64',
@@ -986,6 +955,37 @@
             },
           },
         },
+        {
+          # TODO(rvargas): Remove this when gyp finally supports a clean model.
+          # See bug 36232.
+          'target_name': 'base_static_win64',
+          'type': 'static_library',
+          'sources': [
+            'base_switches.cc',
+            'base_switches.h',
+            'win/pe_image.cc',
+            'win/pe_image.h',
+          ],
+          'sources!': [
+            # base64.cc depends on modp_b64.
+            'base64.cc',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'configurations': {
+            'Common_Base': {
+              'msvs_target_platform': 'x64',
+            },
+          },
+          'defines': [
+            'NACL_WIN64',
+          ],
+          # TODO(rvargas): Bug 78117. Remove this.
+          'msvs_disabled_warnings': [
+            4244,
+          ],
+        },
       ],
     }],
     ['os_posix==1 and OS!="mac" and OS!="ios"', {
diff --git a/base/third_party/dynamic_annotations/dynamic_annotations.gyp b/base/third_party/dynamic_annotations/dynamic_annotations.gyp
index 1f1dc49..f526c7f 100644
--- a/base/third_party/dynamic_annotations/dynamic_annotations.gyp
+++ b/base/third_party/dynamic_annotations/dynamic_annotations.gyp
@@ -19,7 +19,7 @@
     },
   ],
   'conditions': [
-    ['OS == "win"', {
+    ['OS == "win" and target_arch=="ia32"', {
       'targets': [
         {
           'target_name': 'dynamic_annotations_win64',
diff --git a/breakpad/breakpad_handler.gypi b/breakpad/breakpad_handler.gypi
index 521939b..4764f8d 100644
--- a/breakpad/breakpad_handler.gypi
+++ b/breakpad/breakpad_handler.gypi
@@ -32,7 +32,7 @@
     ],
   },
   'conditions': [
-    [ 'OS=="win"', {
+    ['OS=="win"', {
       'targets': [
         {
           'target_name': 'breakpad_handler',
@@ -70,6 +70,10 @@
             ],
           },
         },
+      ],
+    }],
+    ['OS=="win" and target_arch=="ia32"', {
+      'targets': [
         {
           'target_name': 'breakpad_handler_win64',
           'type': 'static_library',
diff --git a/breakpad/breakpad_sender.gypi b/breakpad/breakpad_sender.gypi
index 45b2195..9f5f897 100644
--- a/breakpad/breakpad_sender.gypi
+++ b/breakpad/breakpad_sender.gypi
@@ -22,7 +22,7 @@
     ],
   },
   'conditions': [
-    [ 'OS=="win"', {
+    ['OS=="win"', {
       'targets': [
         {
           'target_name': 'breakpad_sender',
@@ -38,6 +38,10 @@
             ],
           },
         },
+      ],
+    }],
+    ['OS=="win" and target_arch=="ia32"', {
+      'targets': [
         {
           'target_name': 'breakpad_sender_win64',
           'type': 'static_library',
diff --git a/chrome/app/policy/cloud_policy_codegen.gyp b/chrome/app/policy/cloud_policy_codegen.gyp
index 9988d31..caa2ab4 100644
--- a/chrome/app/policy/cloud_policy_codegen.gyp
+++ b/chrome/app/policy/cloud_policy_codegen.gyp
@@ -163,7 +163,7 @@
     },
   ],
   'conditions': [
-    ['OS=="win"', {
+    ['OS=="win" and target_arch=="ia32"', {
       'targets': [
         {
           'target_name': 'policy_win64',
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index f05fee7..c5febb0 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1010,6 +1010,23 @@
           },
         },
         {
+          'target_name': 'sb_sigutil',
+          'type': 'executable',
+          'dependencies': [
+            '../base/base.gyp:base',
+            'safe_browsing_proto',
+          ],
+          'sources': [
+            'browser/safe_browsing/signature_util.h',
+            'browser/safe_browsing/signature_util_win.cc',
+            'tools/safe_browsing/sb_sigutil.cc',
+          ],
+        },
+      ]},  # 'targets'
+    ],  # OS=="win"
+    ['OS=="win" and target_arch=="ia32"',
+      { 'targets': [
+        {
           'target_name': 'crash_service_win64',
           'type': 'executable',
           'product_name': 'crash_service64',
@@ -1043,21 +1060,8 @@
             },
           },
         },
-        {
-          'target_name': 'sb_sigutil',
-          'type': 'executable',
-          'dependencies': [
-            '../base/base.gyp:base',
-            'safe_browsing_proto',
-          ],
-          'sources': [
-            'browser/safe_browsing/signature_util.h',
-            'browser/safe_browsing/signature_util_win.cc',
-            'tools/safe_browsing/sb_sigutil.cc',
-          ],
-        },
       ]},  # 'targets'
-    ],  # OS=="win"
+    ],  # OS=="win" and target_arch=="ia32"
     ['chromeos==1', {
       'includes': [ 'chrome_browser_chromeos.gypi' ],
     }],  # chromeos==1
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index 9d94b27..a6bb33d 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -198,33 +198,6 @@
           ],
         },
         {
-          'target_name': 'launcher_support64',
-          'type': 'static_library',
-          'include_dirs': [
-            '..',
-          ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '..',
-            ],
-          },
-          'defines': [
-              '<@(nacl_win64_defines)',
-          ],
-              'dependencies': [
-              '<(DEPTH)/base/base.gyp:base_nacl_win64',
-          ],
-          'configurations': {
-            'Common_Base': {
-              'msvs_target_platform': 'x64',
-            },
-          },
-          'sources': [
-            'installer/launcher_support/chrome_launcher_support.cc',
-            'installer/launcher_support/chrome_launcher_support.h',
-          ],
-        },
-        {
           'target_name': 'mini_installer_test',
           'type': 'executable',
           'dependencies': [
@@ -488,6 +461,37 @@
         },
       ],
     }],
+    ['OS=="win" and target_arch=="ia32"', {
+      'targets': [
+        {
+          'target_name': 'launcher_support64',
+          'type': 'static_library',
+          'include_dirs': [
+            '..',
+          ],
+          'direct_dependent_settings': {
+            'include_dirs': [
+              '..',
+            ],
+          },
+          'defines': [
+              '<@(nacl_win64_defines)',
+          ],
+              'dependencies': [
+              '<(DEPTH)/base/base.gyp:base_nacl_win64',
+          ],
+          'configurations': {
+            'Common_Base': {
+              'msvs_target_platform': 'x64',
+            },
+          },
+          'sources': [
+            'installer/launcher_support/chrome_launcher_support.cc',
+            'installer/launcher_support/chrome_launcher_support.h',
+          ],
+        },
+      ],
+    }],
     ['OS=="linux" and branding=="Chrome"', {
       'variables': {
         # Always google_chrome since this only applies to branding==Chrome.
diff --git a/chrome/chrome_installer_util.gypi b/chrome/chrome_installer_util.gypi
index 3486131..5fdc8724 100644
--- a/chrome/chrome_installer_util.gypi
+++ b/chrome/chrome_installer_util.gypi
@@ -163,6 +163,10 @@
             }],
           ],
         },
+      ],
+    }],
+    ['OS=="win" and target_arch=="ia32"', {
+      'targets': [
         {
           'target_name': 'installer_util_nacl_win64',
           'type': 'static_library',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 56fd47f..4ff4e4f 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -67,6 +67,10 @@
         ['OS=="win"', {
           'dependencies': [
             'chrome.gyp:crash_service',  # run time dependency
+          ],
+        }],
+        ['OS=="win" and target_arch=="ia32"', {
+          'dependencies': [
             'chrome.gyp:crash_service_win64',  # run time dependency
           ],
         }],
diff --git a/chrome/common_constants.gyp b/chrome/common_constants.gyp
index 4e39158..e231e11 100644
--- a/chrome/common_constants.gyp
+++ b/chrome/common_constants.gyp
@@ -82,7 +82,7 @@
     },
   ],
   'conditions': [
-    ['OS=="win"', {
+    ['OS=="win" and target_arch=="ia32"', {
       'targets': [
         {
           'target_name': 'common_constants_win64',
diff --git a/cloud_print/cloud_print.gyp b/cloud_print/cloud_print.gyp
index bb15405..a563cf5 100644
--- a/cloud_print/cloud_print.gyp
+++ b/cloud_print/cloud_print.gyp
@@ -14,6 +14,10 @@
           'dependencies': [
             'virtual_driver/win/install/virtual_driver_install.gyp:*',
             'virtual_driver/win/virtual_driver.gyp:*',
+          ],
+        }],
+        ['OS=="win" and target_arch=="ia32"', {
+          'dependencies': [
             'virtual_driver/win/virtual_driver64.gyp:*',
           ],
         }],
diff --git a/courgette/courgette.gyp b/courgette/courgette.gyp
index 31276ae..a1c6c1c 100644
--- a/courgette/courgette.gyp
+++ b/courgette/courgette.gyp
@@ -151,7 +151,7 @@
     },
   ],
   'conditions': [
-    ['OS=="win"', {
+    ['OS=="win" and target_arch=="ia32"', {
       'targets': [
         {
           'target_name': 'courgette_lib64',
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp
index 60a34c6a..b9742f7f 100644
--- a/crypto/crypto.gyp
+++ b/crypto/crypto.gyp
@@ -338,7 +338,7 @@
     },
   ],
   'conditions': [
-    [ 'OS == "win"', {
+    ['OS == "win" and target_arch=="ia32"', {
       'targets': [
         {
           'target_name': 'crypto_nacl_win64',
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 3657bae..8cc6756 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -415,7 +415,7 @@
         },
       ],
     }],
-    ['disable_nacl!=1 and OS=="win"', {
+    ['disable_nacl!=1 and OS=="win" and target_arch=="ia32"', {
       'targets': [
         {
           'target_name': 'gpu_ipc_win64',
diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
index c56f68a..edc53a4 100644
--- a/ipc/ipc.gyp
+++ b/ipc/ipc.gyp
@@ -141,7 +141,7 @@
     },
   ],
   'conditions': [
-    ['OS=="win"', {
+    ['OS=="win" and target_arch=="ia32"', {
       'targets': [
         {
           'target_name': 'ipc_win64',
diff --git a/ppapi/ppapi_internal.gyp b/ppapi/ppapi_internal.gyp
index 26a9dbf..c474a7d 100644
--- a/ppapi/ppapi_internal.gyp
+++ b/ppapi/ppapi_internal.gyp
@@ -171,7 +171,7 @@
         },
       ],
     }],
-    ['disable_nacl!=1 and OS=="win"', {
+    ['disable_nacl!=1 and OS=="win" and target_arch=="ia32"', {
       # In windows builds, we also want to define some targets to build in
       # 64-bit mode for use by nacl64.exe (the NaCl helper process for 64-bit
       # Windows).
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)',
+          ]
+        },
+      ],
+    }],
+  ],
 }