linux: remove split base_extra_target from base.gyp

Previously we built part of base twice under different configurations.  This reverts r49502 (http://codereview.chromium.org/2796002), since we don't need a separate fpic base target now that all of Linux is built with fpic.
Review URL: http://codereview.chromium.org/5361011

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

1 files changed, 166 insertions, 232 deletions

diff --git a/base/base.gypi b/base/base.gypi
index a71ccf4..c71f28a 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -6,7 +6,6 @@
   'target_defaults': {
     'variables': {
       'base_target': 0,
-      'base_extra_target': 0,
     },
     'target_conditions': [
       # This part is shared between the targets defined below.
@@ -406,180 +405,6 @@
           },],
         ],
       }],
-      ['base_extra_target==1', {
-        'sources': [
-          'crypto/capi_util.cc',
-          'crypto/capi_util.h',
-          'crypto/cssm_init.cc',
-          'crypto/cssm_init.h',
-          'crypto/encryptor.h',
-          'crypto/encryptor_mac.cc',
-          'crypto/encryptor_nss.cc',
-          'crypto/encryptor_openssl.cc',
-          'crypto/encryptor_win.cc',
-          'crypto/rsa_private_key.h',
-          'crypto/rsa_private_key.cc',
-          'crypto/rsa_private_key_mac.cc',
-          'crypto/rsa_private_key_nss.cc',
-          'crypto/rsa_private_key_openssl.cc',
-          'crypto/rsa_private_key_win.cc',
-          'crypto/signature_creator.h',
-          'crypto/signature_creator_mac.cc',
-          'crypto/signature_creator_nss.cc',
-          'crypto/signature_creator_openssl.cc',
-          'crypto/signature_creator_win.cc',
-          'crypto/signature_verifier.h',
-          'crypto/signature_verifier_mac.cc',
-          'crypto/signature_verifier_nss.cc',
-          'crypto/signature_verifier_openssl.cc',
-          'crypto/signature_verifier_win.cc',
-          'crypto/symmetric_key.h',
-          'crypto/symmetric_key_mac.cc',
-          'crypto/symmetric_key_nss.cc',
-          'crypto/symmetric_key_openssl.cc',
-          'crypto/symmetric_key_win.cc',
-          'third_party/nspr/prcpucfg.h',
-          'third_party/nspr/prcpucfg_win.h',
-          'third_party/nspr/prtypes.h',
-          'third_party/nss/blapi.h',
-          'third_party/nss/blapit.h',
-          'third_party/nss/sha256.h',
-          'third_party/nss/sha512.cc',
-          'third_party/purify/pure.h',
-          'third_party/purify/pure_api.c',
-          'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
-          'third_party/xdg_user_dirs/xdg_user_dir_lookup.h',
-          'auto_reset.h',
-          'base64.cc',
-          'base64.h',
-          'data_pack.cc',
-          'event_recorder.cc',
-          'event_recorder.h',
-          'event_recorder_stubs.cc',
-          'file_descriptor_shuffle.cc',
-          'file_descriptor_shuffle.h',
-          'hmac.h',
-          'hmac_mac.cc',
-          'hmac_nss.cc',
-          'hmac_openssl.cc',
-          'hmac_win.cc',
-          'image_util.cc',
-          'image_util.h',
-          'linux_util.cc',
-          'linux_util.h',
-          'md5.cc',
-          'md5.h',
-          'message_pump_glib.cc',
-          'message_pump_glib.h',
-          'message_pump_glib_x.cc',
-          'message_pump_glib_x.h',
-          'message_pump_glib_x_dispatch.h',
-          'message_pump_libevent.cc',
-          'message_pump_libevent.h',
-          'message_pump_mac.h',
-          'message_pump_mac.mm',
-          'metrics/field_trial.cc',
-          'metrics/field_trial.h',
-          'nsimage_cache_mac.h',
-          'nsimage_cache_mac.mm',
-          'nss_util.cc',
-          'nss_util.h',
-          'openssl_util.cc',
-          'openssl_util.h',
-          'setproctitle_linux.c',
-          'setproctitle_linux.h',
-          'sha2.cc',
-          'sha2.h',
-          'sha2_openssl.cc',
-          'string16.cc',
-          'string16.h',
-          'sync_socket.h',
-          'sync_socket_win.cc',
-          'sync_socket_posix.cc',
-          'time_mac.cc',
-          'time_posix.cc',
-        ],
-        'conditions': [
-          [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
-            'conditions': [
-              [ 'chromeos==1', {
-                  'sources/': [ ['include', '_chromeos\\.cc$'] ]
-                },
-              ],
-            ],
-            'defines': [
-              'USE_SYMBOLIZE',
-            ],
-            'cflags': [
-              '-Wno-write-strings',
-            ],
-          }, {  # OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"
-              'sources/': [
-                ['exclude', '/xdg_user_dirs/'],
-                ['exclude', '_nss\.cc$'],
-              ],
-          }],
-          [ 'OS != "mac"', {
-              'sources!': [
-                'crypto/cssm_init.cc',
-                'crypto/cssm_init.h',
-              ],
-          },],
-          [ 'OS != "win"', {
-              'sources!': [
-                'third_party/purify/pure_api.c',
-                'base_drag_source.cc',
-                'base_drop_target.cc',
-                'cpu.cc',
-                'crypto/capi_util.h',
-                'crypto/capi_util.cc',
-                'debug_on_start.cc',
-                'event_recorder.cc',
-                'file_version_info.cc',
-                'image_util.cc',
-                'object_watcher.cc',
-                'pe_image.cc',
-                'registry.cc',
-                'resource_util.cc',
-                'win_util.cc',
-              ],
-          },],
-          [ 'use_openssl==1', {
-              # TODO(joth): Use a glob to match exclude patterns once the
-              #             OpenSSL file set is complete.
-              'sources!': [
-                'crypto/encryptor_nss.cc',
-                'crypto/rsa_private_key_nss.cc',
-                'crypto/signature_creator_nss.cc',
-                'crypto/signature_verifier_nss.cc',
-                'crypto/symmetric_key_nss.cc',
-                'hmac_nss.cc',
-                'nss_util.cc',
-                'nss_util.h',
-                # Note that sha2.cc depends on the NSS files bundled into
-                # chromium; it does not have the _nss postfix as it is required
-                # on platforms besides linux and *bsd.
-                'sha2.cc',
-                'third_party/nss/blapi.h',
-                'third_party/nss/blapit.h',
-                'third_party/nss/sha256.h',
-                'third_party/nss/sha512.cc',
-              ],
-            }, {
-              'sources!': [
-                'crypto/encryptor_openssl.cc',
-                'crypto/rsa_private_key_openssl.cc',
-                'crypto/signature_creator_openssl.cc',
-                'crypto/signature_verifier_openssl.cc',
-                'crypto/symmetric_key_openssl.cc',
-                'hmac_openssl.cc',
-                'openssl_util.cc',
-                'openssl_util.h',
-                'sha2_openssl.cc',
-              ],
-          },],
-        ],
-      }],
     ],
   },
   'targets': [
@@ -589,7 +414,6 @@
       'msvs_guid': '1832A374-8A74-4F9E-B536-69A699B3E165',
       'variables': {
         'base_target': 1,
-        'base_extra_target': 1,
       },
       'dependencies': [
         '../third_party/modp_b64/modp_b64.gyp:modp_b64',
@@ -603,8 +427,12 @@
         ],
       },
       'conditions': [
-        [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
+        [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
           'conditions': [
+            [ 'chromeos==1', {
+                'sources/': [ ['include', '_chromeos\\.cc$'] ]
+              },
+            ],
             [ 'linux_use_tcmalloc==0', {
                 'defines': [
                   'NO_TCMALLOC',
@@ -634,11 +462,22 @@
             '../build/linux/system.gyp:x11',
             'xdg_mime',
           ],
+          'defines': [
+            'USE_SYMBOLIZE',
+          ],
+          'cflags': [
+            '-Wno-write-strings',
+          ],
           'export_dependent_settings': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:x11',
           ],
-        },],
+        }, {  # OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"
+            'sources/': [
+              ['exclude', '/xdg_user_dirs/'],
+              ['exclude', '_nss\.cc$'],
+            ],
+        }],
         [ 'OS == "freebsd" or OS == "openbsd"', {
           'link_settings': {
             'libraries': [
@@ -668,7 +507,12 @@
               '$(SDKROOT)/System/Library/Frameworks/Security.framework',
             ],
           },
-        },],
+        }, {  # OS != "mac"
+          'sources!': [
+            'crypto/cssm_init.cc',
+            'crypto/cssm_init.h',
+          ],
+        }],
         [ 'OS == "mac" or OS == "win"', {
             'dependencies': [
               '../third_party/nss/nss.gyp:nss',
@@ -676,7 +520,150 @@
         },],
         [ 'OS != "win"', {
             'dependencies': ['../third_party/libevent/libevent.gyp:libevent'],
+            'sources!': [
+              'third_party/purify/pure_api.c',
+              'base_drag_source.cc',
+              'base_drop_target.cc',
+              'cpu.cc',
+              'crypto/capi_util.h',
+              'crypto/capi_util.cc',
+              'debug_on_start.cc',
+              'event_recorder.cc',
+              'file_version_info.cc',
+              'image_util.cc',
+              'object_watcher.cc',
+              'pe_image.cc',
+              'registry.cc',
+              'resource_util.cc',
+              'win_util.cc',
+            ],
         },],
+        [ 'use_openssl==1', {
+            # TODO(joth): Use a glob to match exclude patterns once the
+            #             OpenSSL file set is complete.
+            'sources!': [
+              'crypto/encryptor_nss.cc',
+              'crypto/rsa_private_key_nss.cc',
+              'crypto/signature_creator_nss.cc',
+              'crypto/signature_verifier_nss.cc',
+              'crypto/symmetric_key_nss.cc',
+              'hmac_nss.cc',
+              'nss_util.cc',
+              'nss_util.h',
+              # Note that sha2.cc depends on the NSS files bundled into
+              # chromium; it does not have the _nss postfix as it is required
+              # on platforms besides linux and *bsd.
+              'sha2.cc',
+              'third_party/nss/blapi.h',
+              'third_party/nss/blapit.h',
+              'third_party/nss/sha256.h',
+              'third_party/nss/sha512.cc',
+            ],
+          }, {
+            'sources!': [
+              'crypto/encryptor_openssl.cc',
+              'crypto/rsa_private_key_openssl.cc',
+              'crypto/signature_creator_openssl.cc',
+              'crypto/signature_verifier_openssl.cc',
+              'crypto/symmetric_key_openssl.cc',
+              'hmac_openssl.cc',
+              'openssl_util.cc',
+              'openssl_util.h',
+              'sha2_openssl.cc',
+            ],
+        },],
+      ],
+      'sources': [
+        'crypto/capi_util.cc',
+        'crypto/capi_util.h',
+        'crypto/cssm_init.cc',
+        'crypto/cssm_init.h',
+        'crypto/encryptor.h',
+        'crypto/encryptor_mac.cc',
+        'crypto/encryptor_nss.cc',
+        'crypto/encryptor_openssl.cc',
+        'crypto/encryptor_win.cc',
+        'crypto/rsa_private_key.h',
+        'crypto/rsa_private_key.cc',
+        'crypto/rsa_private_key_mac.cc',
+        'crypto/rsa_private_key_nss.cc',
+        'crypto/rsa_private_key_openssl.cc',
+        'crypto/rsa_private_key_win.cc',
+        'crypto/signature_creator.h',
+        'crypto/signature_creator_mac.cc',
+        'crypto/signature_creator_nss.cc',
+        'crypto/signature_creator_openssl.cc',
+        'crypto/signature_creator_win.cc',
+        'crypto/signature_verifier.h',
+        'crypto/signature_verifier_mac.cc',
+        'crypto/signature_verifier_nss.cc',
+        'crypto/signature_verifier_openssl.cc',
+        'crypto/signature_verifier_win.cc',
+        'crypto/symmetric_key.h',
+        'crypto/symmetric_key_mac.cc',
+        'crypto/symmetric_key_nss.cc',
+        'crypto/symmetric_key_openssl.cc',
+        'crypto/symmetric_key_win.cc',
+        'third_party/nspr/prcpucfg.h',
+        'third_party/nspr/prcpucfg_win.h',
+        'third_party/nspr/prtypes.h',
+        'third_party/nss/blapi.h',
+        'third_party/nss/blapit.h',
+        'third_party/nss/sha256.h',
+        'third_party/nss/sha512.cc',
+        'third_party/purify/pure.h',
+        'third_party/purify/pure_api.c',
+        'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
+        'third_party/xdg_user_dirs/xdg_user_dir_lookup.h',
+        'auto_reset.h',
+        'base64.cc',
+        'base64.h',
+        'data_pack.cc',
+        'event_recorder.cc',
+        'event_recorder.h',
+        'event_recorder_stubs.cc',
+        'file_descriptor_shuffle.cc',
+        'file_descriptor_shuffle.h',
+        'hmac.h',
+        'hmac_mac.cc',
+        'hmac_nss.cc',
+        'hmac_openssl.cc',
+        'hmac_win.cc',
+        'image_util.cc',
+        'image_util.h',
+        'linux_util.cc',
+        'linux_util.h',
+        'md5.cc',
+        'md5.h',
+        'message_pump_glib.cc',
+        'message_pump_glib.h',
+        'message_pump_glib_x.cc',
+        'message_pump_glib_x.h',
+        'message_pump_glib_x_dispatch.h',
+        'message_pump_libevent.cc',
+        'message_pump_libevent.h',
+        'message_pump_mac.h',
+        'message_pump_mac.mm',
+        'metrics/field_trial.cc',
+        'metrics/field_trial.h',
+        'nsimage_cache_mac.h',
+        'nsimage_cache_mac.mm',
+        'nss_util.cc',
+        'nss_util.h',
+        'openssl_util.cc',
+        'openssl_util.h',
+        'setproctitle_linux.c',
+        'setproctitle_linux.h',
+        'sha2.cc',
+        'sha2.h',
+        'sha2_openssl.cc',
+        'string16.cc',
+        'string16.h',
+        'sync_socket.h',
+        'sync_socket_win.cc',
+        'sync_socket_posix.cc',
+        'time_mac.cc',
+        'time_posix.cc',
       ],
     },
   ],
@@ -714,59 +701,6 @@
         },
       ],
     }],
-    [ 'OS == "linux" and internal_pdf', {
-      'targets': [
-        {
-          'target_name': 'base_fpic',
-          'type': '<(library)',
-          'variables': {
-            'base_target': 1,
-            'base_extra_target': 1,
-          },
-          'cflags': [
-            '-fPIC',
-          ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '..',
-            ],
-          },
-          'conditions': [
-            [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
-              'dependencies': [
-                '../build/util/build_util.gyp:lastchange',
-                '../build/linux/system.gyp:gtk',
-                '../build/linux/system.gyp:nss',
-                '../build/linux/system.gyp:x11',
-                'xdg_mime',
-              ],
-              'export_dependent_settings': [
-                '../build/linux/system.gyp:gtk',
-                '../build/linux/system.gyp:x11',
-              ],
-            },],
-            ['OS == "linux"', {
-              'link_settings': {
-                'libraries': [
-                  # We need rt for clock_gettime().
-                  '-lrt',
-                  # For 'native_library_linux.cc'
-                  '-ldl',
-                ],
-              },
-            }],
-            [ 'OS == "mac" or OS == "win"', {
-                'dependencies': [
-                  '../third_party/nss/nss.gyp:nss',
-                ],
-            },],
-            [ 'OS != "win"', {
-                'dependencies': ['../third_party/libevent/libevent.gyp:libevent'],
-            },],
-          ],
-        },
-      ],
-    }],
     [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
       'targets': [
         {