Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(109)

Side by Side Diff: base/base.gyp

Issue 167693002: Remove use_system_nspr build flag. It's not "officially" supported (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | base/base.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 },], 227 },],
228 ['component=="shared_library"', { 228 ['component=="shared_library"', {
229 'conditions': [ 229 'conditions': [
230 ['OS=="win"', { 230 ['OS=="win"', {
231 'sources!': [ 231 'sources!': [
232 'debug/debug_on_start_win.cc', 232 'debug/debug_on_start_win.cc',
233 ], 233 ],
234 }], 234 }],
235 ], 235 ],
236 }], 236 }],
237 ['use_system_nspr==1', {
238 'dependencies': [
239 'third_party/nspr/nspr.gyp:nspr',
240 ],
241 }],
242 ], 237 ],
243 'sources': [ 238 'sources': [
244 'third_party/nspr/prcpucfg.h', 239 'third_party/nspr/prcpucfg.h',
245 'third_party/nspr/prcpucfg_win.h', 240 'third_party/nspr/prcpucfg_win.h',
246 'third_party/nspr/prtypes.h', 241 'third_party/nspr/prtypes.h',
247 'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc', 242 'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
248 'third_party/xdg_user_dirs/xdg_user_dir_lookup.h', 243 'third_party/xdg_user_dirs/xdg_user_dir_lookup.h',
249 'async_socket_io_handler.h', 244 'async_socket_io_handler.h',
250 'async_socket_io_handler_posix.cc', 245 'async_socket_io_handler_posix.cc',
251 'async_socket_io_handler_win.cc', 246 'async_socket_io_handler_win.cc',
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
804 }, { # OS != "win" 799 }, { # OS != "win"
805 'dependencies': [ 800 'dependencies': [
806 '../third_party/libevent/libevent.gyp:libevent' 801 '../third_party/libevent/libevent.gyp:libevent'
807 ], 802 ],
808 }], 803 }],
809 ['use_aura==1 and use_x11==1', { 804 ['use_aura==1 and use_x11==1', {
810 'sources': [ 805 'sources': [
811 'x11/edid_parser_x11_unittest.cc', 806 'x11/edid_parser_x11_unittest.cc',
812 ], 807 ],
813 }], 808 }],
814 ['use_system_nspr==1', {
815 'dependencies': [
816 'third_party/nspr/nspr.gyp:nspr',
817 ],
818 }],
819 ], # conditions 809 ], # conditions
820 'target_conditions': [ 810 'target_conditions': [
821 ['OS == "ios" and _toolset != "host"', { 811 ['OS == "ios" and _toolset != "host"', {
822 'sources/': [ 812 'sources/': [
823 # Pull in specific Mac files for iOS (which have been filtered out 813 # Pull in specific Mac files for iOS (which have been filtered out
824 # by file name rules). 814 # by file name rules).
825 ['include', '^mac/objc_property_releaser_unittest\\.mm$'], 815 ['include', '^mac/objc_property_releaser_unittest\\.mm$'],
826 ['include', '^mac/bind_objc_block_unittest\\.mm$'], 816 ['include', '^mac/bind_objc_block_unittest\\.mm$'],
827 ['include', '^mac/scoped_nsobject_unittest\\.mm$'], 817 ['include', '^mac/scoped_nsobject_unittest\\.mm$'],
828 ['include', '^sys_string_conversions_mac_unittest\\.mm$'], 818 ['include', '^sys_string_conversions_mac_unittest\\.mm$'],
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after
1458 'base_unittests.isolate', 1448 'base_unittests.isolate',
1459 ], 1449 ],
1460 'sources': [ 1450 'sources': [
1461 'base_unittests.isolate', 1451 'base_unittests.isolate',
1462 ], 1452 ],
1463 }, 1453 },
1464 ], 1454 ],
1465 }], 1455 }],
1466 ], 1456 ],
1467 } 1457 }
OLDNEW
« no previous file with comments | « no previous file | base/base.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698