Create a base_static library with files that should not

be used from a dll (base.dll), and fix some incorrect
dependencies.

BUG=76996
TEST=none
Review URL: http://codereview.chromium.org/6759047

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

4 files changed, 53 insertions, 11 deletions

diff --git a/base/base.gyp b/base/base.gyp
index 0c2ac86..183749e 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -54,6 +54,48 @@
       ],
     },
     {
+      # This is the subset of files from base that should not be used with a
+      # dynamic library.
+      'target_name': 'base_static',
+      'type': '<(library)',
+      'sources': [
+        'base_switches.cc',
+        'base_switches.h',
+        'win/pe_image.cc',
+        'win/pe_image.h',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+    },
+    {
+      # TODO(rvargas): Remove this when gyp finally supports a clean model.
+      # See bug 36232.
+      'target_name': 'base_static_win64',
+      'type': '<(library)',
+      'sources': [
+        'base_switches.cc',
+        'base_switches.h',
+        'win/pe_image.cc',
+        'win/pe_image.h',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'configurations': {
+        'Common_Base': {
+          'msvs_target_platform': 'x64',
+        },
+      },
+      'defines': [
+        'NACL_WIN64',
+      ],
+      # TODO(rvargas): Bug 78117. Remove this.
+      'msvs_disabled_warnings': [
+        4244,
+      ],
+    },
+    {
       'target_name': 'base_unittests',
       'type': 'executable',
       'msvs_guid': '27A30967-4BBA-48D1-8522-CDE95F7B1CEC',
@@ -185,6 +227,7 @@
       'dependencies': [
         'base',
         'base_i18n',
+        'base_static',
         'test_support_base',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
diff --git a/base/base.gypi b/base/base.gypi
index e4d10ff..3c41a39 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -34,8 +34,6 @@
           'base_paths_linux.cc',
           'base_paths_win.cc',
           'base_paths_win.h',
-          'base_switches.cc',
-          'base_switches.h',
           'basictypes.h',
           'bind.h',
           'bind_helpers.h',
@@ -310,17 +308,15 @@
           'version.h',
           'vlog.cc',
           'vlog.h',
-          'win/i18n.cc',
-          'win/i18n.h',
-          'win/object_watcher.cc',
-          'win/object_watcher.h',
-          'win/pe_image.cc',
           'win/event_trace_consumer.h',
           'win/event_trace_controller.cc',
           'win/event_trace_controller.h',
           'win/event_trace_provider.cc',
           'win/event_trace_provider.h',
-          'win/pe_image.h',
+          'win/i18n.cc',
+          'win/i18n.h',
+          'win/object_watcher.cc',
+          'win/object_watcher.h',
           'win/registry.cc',
           'win/registry.h',
           'win/scoped_bstr.cc',
@@ -418,6 +414,7 @@
         'base_target': 1,
       },
       'dependencies': [
+        'base_static',
         '../third_party/modp_b64/modp_b64.gyp:modp_b64',
         'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
       ],
@@ -538,7 +535,6 @@
               'crypto/capi_util.cc',
               'event_recorder.cc',
               'file_version_info.cc',
-              'pe_image.cc',
               'registry.cc',
               'resource_util.cc',
               'win_util.cc',
@@ -685,6 +681,7 @@
             'base_target': 1,
           },
           'dependencies': [
+            'base_static_win64',
             'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64',
           ],
           # TODO(gregoryd): direct_dependent_settings should be shared with the
diff --git a/net/net.gyp b/net/net.gyp
index 9dc4a7b..90206d2 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -13,6 +13,7 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
+        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../sdch/sdch.gyp:sdch',
         '../third_party/icu/icu.gyp:icui18n',
diff --git a/sandbox/sandbox.gyp b/sandbox/sandbox.gyp
index 692e526..e44e817 100644
--- a/sandbox/sandbox.gyp
+++ b/sandbox/sandbox.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -188,6 +188,7 @@
           'dependencies': [
             '../testing/gtest.gyp:gtest',
             '../base/base.gyp:base',
+            '../base/base.gyp:base_static',
           ],
           'msvs_guid': '881F6A97-D539-4C48-B401-DF04385B2343',
           'sources': [