Linux: add option to use system nspr.

Note that for NaCl bundles nspr files will be used anyway, since NaCl toolchain doesn't looks for libraries in system directories.

BUG=none

Review URL: https://codereview.chromium.org/11685002

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

base/base.gyp

@@ -206,6 +206,11 @@
             }],
           ],
         }],
+        ['use_system_nspr==1', {
+          'dependencies': [
+            'third_party/nspr/nspr.gyp:nspr',
+          ],
+        }],
       ],
       'sources': [
         'third_party/nspr/prcpucfg.h',
@@ -716,6 +721,11 @@
             'win/win_util_unittest.cc',
           ],
         }],
+        ['use_system_nspr==1', {
+          'dependencies': [
+            'third_party/nspr/nspr.gyp:nspr',
+          ],
+        }],
       ],  # conditions
       'target_conditions': [
         ['OS == "ios"', {

base/base.gypi

@@ -17,9 +17,17 @@
           'third_party/dmg_fp/dtoa_wrapper.cc',
           'third_party/icu/icu_utf.cc',
           'third_party/icu/icu_utf.h',
+          'third_party/nspr/prcpucfg.h',
+          'third_party/nspr/prcpucfg_freebsd.h',
+          'third_party/nspr/prcpucfg_linux.h',
+          'third_party/nspr/prcpucfg_mac.h',
+          'third_party/nspr/prcpucfg_nacl.h',
+          'third_party/nspr/prcpucfg_openbsd.h',
+          'third_party/nspr/prcpucfg_solaris.h',
+          'third_party/nspr/prcpucfg_win.h',
           'third_party/nspr/prtime.cc',
           'third_party/nspr/prtime.h',
-          'third_party/nspr/prcpucfg_linux.h',
+          'third_party/nspr/prtypes.h',
           'third_party/xdg_mime/xdgmime.h',
           'allocator/allocator_extension.cc',
           'allocator/allocator_extension.h',
@@ -727,6 +735,11 @@
           ['OS == "win" and >(nacl_untrusted_build)==1', {
               'sources/': [ ['exclude', '\\.h$'] ],
           }],
+          ['<(use_system_nspr)==1 and >(nacl_untrusted_build)==0', {
+            'sources/': [
+              ['exclude', '^third_party/nspr/'],
+            ],
+          }],
         ],
       }],
     ],

base/base_untrusted.gyp

@@ -25,7 +25,6 @@
             'sources': [
               'string16.cc',
               'sync_socket_nacl.cc',
-              'third_party/nspr/prtime.cc',
               'time_posix.cc',
             ],
           },

base/third_party/nspr/nspr.gyp

+# Copyright (c) 2012 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.
+
+{
+  'conditions': [
+    ['use_system_nspr==1', {
+      'targets': [
+        {
+          'target_name': 'nspr',
+          'type': 'none',
+          'toolsets': ['host', 'target'],
+          'variables': {
+            'headers_root_path': '.',
+            'header_filenames': [
+              'prcpucfg.h',
+              'prtime.h',
+              'prtypes.h',
+            ],
+          },
+          'includes': [
+            '../../../build/shim_headers.gypi',
+          ],
+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(pkg-config --cflags nspr)',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '<!@(pkg-config --libs-only-L --libs-only-other nspr)',
+            ],
+            'libraries': [
+              '<!@(pkg-config --libs-only-l nspr)',
+            ],
+          },
+        }
+      ],
+    }],
+  ],
+}

build/common.gypi

@@ -723,6 +723,9 @@
     'google_default_client_id%': '<(google_default_client_id)',
     'google_default_client_secret%': '<(google_default_client_secret)',
 
+    # Use system nspr instead of the bundled one.
+    'use_system_nspr%': 0,
+
     # Use system protobuf instead of bundled one.
     'use_system_protobuf%': 0,
 

build/shim_headers.gypi

@@ -10,7 +10,7 @@
 
 {
   'variables': {
-    'shim_headers_path': '<(SHARED_INTERMEDIATE_DIR)/shim_headers/<(_target_name)',
+    'shim_headers_path': '<(SHARED_INTERMEDIATE_DIR)/shim_headers/<(_target_name)/<(_toolset)',
   },
   'include_dirs+++': [
     '<(shim_headers_path)',