Base: More adjustments to BASE_API and project dependencies to

base/base.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'base.gypi',
@@ skipping 37 matching lines @@
         'i18n/number_formatting.cc',
         'i18n/number_formatting.h',
         'i18n/rtl.cc',
         'i18n/rtl.h',
         'i18n/time_formatting.cc',
         'i18n/time_formatting.h',
       ],
     },
     {
       # This is the subset of files from base that should not be used with a
-      # dynamic library.
+      # dynamic library. Note that this library cannot depend on base because
+      # base depends on base_static.
       'target_name': 'base_static',
       'type': '<(library)',
       'sources': [
         'base_switches.cc',
         'base_switches.h',
+        'string_util_static.cc',
+        'string_util_static.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',
+        'string_util_static.cc',
+        'string_util_static.h',
         'win/pe_image.cc',
         'win/pe_image.h',
       ],
       'include_dirs': [
         '..',
       ],
       'configurations': {
         'Common_Base': {
           'msvs_target_platform': 'x64',
         },
@@ skipping 124 matching lines @@
         'win/scoped_comptr_unittest.cc',
         'win/scoped_variant_unittest.cc',
         'win/win_util_unittest.cc',
         'win/wrapped_window_proc_unittest.cc',
       ],
       'dependencies': [
         'base',
         'base_i18n',
         'base_static',
         'test_support_base',
+        'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
       'conditions': [
         ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
           'sources!': [
             'file_version_info_unittest.cc',
           ],
           'sources': [
             'nix/xdg_util_unittest.cc',
@@ skipping 38 matching lines @@
             'win_util_unittest.cc',
           ],
         }],
       ],
     },
     {
       'target_name': 'test_support_base',
       'type': '<(library)',
       'dependencies': [
         'base',
+        'base_static',
         'base_i18n',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
+      'export_dependent_settings': [
+        'base',
+      ],
       'conditions': [
         ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
           'dependencies': [
             # test_suite initializes GTK.
             '../build/linux/system.gyp:gtk',
           ],
         }],
       ],
       'sources': [
         'perftimer.cc',
@@ skipping 63 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: