Base: More adjustments to BASE_API and project dependencies to

base/base.gyp

Index: base/base.gyp
===================================================================
--- base/base.gyp	(revision 82052)
+++ base/base.gyp	(working copy)
@@ -55,12 +55,15 @@
     },
     {
       # 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',
       ],
@@ -76,6 +79,8 @@
       'sources': [
         'base_switches.cc',
         'base_switches.h',
+        'string_util_static.cc',
+        'string_util_static.h',
         'win/pe_image.cc',
         'win/pe_image.h',
       ],
@@ -220,6 +225,7 @@
         'base_i18n',
         'base_static',
         'test_support_base',
+        'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
@@ -278,10 +284,14 @@
       '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': [