Remove more library=shared_library pieces.

Leave in the definition of the 'library' variable until we're
certain all users are fixed, but otherwise hardcode it to
static_library.

Review URL: http://codereview.chromium.org/7051017

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

1 files changed, 8 insertions, 26 deletions

diff --git a/build/common.gypi b/build/common.gypi
index 6c8d55e..1174827 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -28,14 +28,6 @@
         'chromeos%': '<(chromeos)',
         'touchui%': '<(touchui)',
 
-        # To do a shared build on linux we need to be able to choose between
-        # type static_library and shared_library. We default to doing a static
-        # build but you can override this with "gyp -Dlibrary=shared_library"
-        # or you can add the following line (without the #) to
-        # ~/.gyp/include.gypi {'variables': {'library': 'shared_library'}}
-        # to compile as shared by default
-        'library%': 'static_library',
-
         # Compute the architecture that we're building on.
         'conditions': [
           [ 'OS=="win" or OS=="mac"', {
@@ -62,9 +54,15 @@
       'chromeos%': '<(chromeos)',
       'touchui%': '<(touchui)',
       'host_arch%': '<(host_arch)',
-      'library%': 'static_library',
       'toolkit_views%': '<(toolkit_views)',
 
+      # We used to provide a variable for changing how libraries were built.
+      # This variable remains until we can clean up all the users.
+      # This needs to be one nested variables dict in so that dependent
+      # gyp files can make use of it in their outer variables.  (Yikes!)
+      # http://code.google.com/p/chromium/issues/detail?id=83308
+      'library%': 'static_library',
+
       # Override branding to select the desired branding flavor.
       'branding%': 'Chromium',
 
@@ -200,6 +198,7 @@
     'buildtype%': '<(buildtype)',
     'target_arch%': '<(target_arch)',
     'host_arch%': '<(host_arch)',
+    'library%': 'static_library',
     'toolkit_views%': '<(toolkit_views)',
     'os_posix%': '<(os_posix)',
     'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
@@ -217,7 +216,6 @@
     'arm_neon%': '<(arm_neon)',
     'sysroot%': '<(sysroot)',
     'disable_sse2%': '<(disable_sse2)',
-    'library%': 'static_library',
     'component%': '<(component)',
     'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)',
     'use_third_party_translations%': '<(use_third_party_translations)',
@@ -1340,22 +1338,6 @@
             'cflags': [ '-g' ],
             'defines': ['USE_LINUX_BREAKPAD'],
           }],
-          ['library=="shared_library"', {
-            # When building with shared libraries, remove the visiblity-hiding
-            # flag.
-            'cflags!': [ '-fvisibility=hidden' ],
-            'conditions': [
-              ['target_arch=="x64" or target_arch=="arm"', {
-                # Shared libraries need -fPIC on x86-64 and arm
-                'cflags': ['-fPIC']
-              }]
-            ],
-            'ldflags!': [
-              # --as-needed confuses library interdependencies.
-              # See http://code.google.com/p/chromium/issues/detail?id=61430
-              '-Wl,--as-needed',
-            ],
-          }],
           ['linux_use_heapchecker==1', {
             'variables': {'linux_use_tcmalloc%': 1},
           }],