Commit 74ad623c authored by rsleevi@chromium.org's avatar rsleevi@chromium.org

Remove use_system_nspr build flag. It's not "officially" supported

BUG=none
R=wtc@chromium.org, phajdan.jr@chromium.org
TBR=willchan

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251527 0039d316-1c4b-4281-b951-d872f2087c98
parent d690157e
......@@ -234,11 +234,6 @@
}],
],
}],
['use_system_nspr==1', {
'dependencies': [
'third_party/nspr/nspr.gyp:nspr',
],
}],
],
'sources': [
'third_party/nspr/prcpucfg.h',
......@@ -811,11 +806,6 @@
'x11/edid_parser_x11_unittest.cc',
],
}],
['use_system_nspr==1', {
'dependencies': [
'third_party/nspr/nspr.gyp:nspr',
],
}],
], # conditions
'target_conditions': [
['OS == "ios" and _toolset != "host"', {
......
......@@ -930,11 +930,6 @@
['OS == "win" and >(nacl_untrusted_build)==1', {
'sources/': [ ['exclude', '\\.h$'] ],
}],
['<(use_system_nspr)==1 and >(nacl_untrusted_build)==0', {
'sources/': [
['exclude', '^third_party/nspr/'],
],
}],
['<(toolkit_uses_gtk) == 1', {
'sources!': [
'x11/x11_error_tracker.cc',
......
# 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)',
],
},
}
],
}],
],
}
......@@ -997,9 +997,6 @@
'use_goma%': '<(use_goma)',
'gomadir%': '<(gomadir)',
# Use system nspr instead of the bundled one.
'use_system_nspr%': 0,
# Use system protobuf instead of bundled one.
'use_system_protobuf%': 0,
......
......@@ -536,11 +536,6 @@
'common/pepper_permission_util.cc',
],
}],
['use_system_nspr==1', {
'dependencies': [
'<(DEPTH)/base/third_party/nspr/nspr.gyp:nspr',
],
}],
['enable_webrtc==0', {
'sources!': [
'common/media/webrtc_logging_messages.h',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment