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

Side by Side Diff: base/base.gypi

Issue 11685002: Linux: add option to use system nspr. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years, 12 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
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 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'base_target': 0, 8 'base_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
11 # This part is shared between the targets defined below. 11 # This part is shared between the targets defined below.
12 ['base_target==1', { 12 ['base_target==1', {
13 'sources': [ 13 'sources': [
14 '../build/build_config.h', 14 '../build/build_config.h',
15 'third_party/dmg_fp/dmg_fp.h', 15 'third_party/dmg_fp/dmg_fp.h',
16 'third_party/dmg_fp/g_fmt.cc', 16 'third_party/dmg_fp/g_fmt.cc',
17 'third_party/dmg_fp/dtoa_wrapper.cc', 17 'third_party/dmg_fp/dtoa_wrapper.cc',
18 'third_party/icu/icu_utf.cc', 18 'third_party/icu/icu_utf.cc',
19 'third_party/icu/icu_utf.h', 19 'third_party/icu/icu_utf.h',
20 'third_party/nspr/prtime.cc', 20 'third_party/nspr/prtime.cc',
21 'third_party/nspr/prtime.h', 21 'third_party/nspr/prtime.h',
22 'third_party/nspr/prcpucfg_linux.h', 22 'third_party/nspr/prcpucfg_linux.h',
wtc 2013/01/04 16:55:28 Please add prtypes.h and prcpucfg.h. I wonder if
Paweł Hajdan Jr. 2013/01/04 18:01:31 Thanks, done.
23 'third_party/xdg_mime/xdgmime.h', 23 'third_party/xdg_mime/xdgmime.h',
24 'allocator/allocator_extension.cc', 24 'allocator/allocator_extension.cc',
25 'allocator/allocator_extension.h', 25 'allocator/allocator_extension.h',
26 'allocator/type_profiler_control.cc', 26 'allocator/type_profiler_control.cc',
27 'allocator/type_profiler_control.h', 27 'allocator/type_profiler_control.h',
28 'android/base_jni_registrar.cc', 28 'android/base_jni_registrar.cc',
29 'android/base_jni_registrar.h', 29 'android/base_jni_registrar.h',
30 'android/build_info.cc', 30 'android/build_info.cc',
31 'android/build_info.h', 31 'android/build_info.h',
32 'android/scoped_java_ref.cc', 32 'android/scoped_java_ref.cc',
(...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 ['<(chromeos)!=1 or >(nacl_untrusted_build)==1', { 720 ['<(chromeos)!=1 or >(nacl_untrusted_build)==1', {
721 'sources/': [ 721 'sources/': [
722 ['exclude', '^chromeos/'], 722 ['exclude', '^chromeos/'],
723 ], 723 ],
724 }], 724 }],
725 # Remove all unnecessary files for build_nexe.py to avoid exceeding 725 # Remove all unnecessary files for build_nexe.py to avoid exceeding
726 # command-line-string limitation when building NaCl on Windows. 726 # command-line-string limitation when building NaCl on Windows.
727 ['OS == "win" and >(nacl_untrusted_build)==1', { 727 ['OS == "win" and >(nacl_untrusted_build)==1', {
728 'sources/': [ ['exclude', '\\.h$'] ], 728 'sources/': [ ['exclude', '\\.h$'] ],
729 }], 729 }],
730 ['<(use_system_nspr)==1', {
Ryan Sleevi 2013/01/03 18:51:35 You're in a conditions block, do not use this vari
Paweł Hajdan Jr. 2013/01/04 18:01:31 Nope. If I don't do that build/gyp_chromium bails
Ryan Sleevi 2013/01/07 00:04:10 Ah, it's because it's within a target_conditions b
731 'sources/': [
732 ['exclude', '^third_party/nspr/'],
wtc 2013/01/04 16:55:28 This will exclude prtime.cc and use the PR_ParseTi
Paweł Hajdan Jr. 2013/01/04 18:01:31 Yep. We're using system headers though. That's the
wtc 2013/01/05 16:23:35 You're right. After I wrote my previous comment, I
733 ],
734 }],
730 ], 735 ],
731 }], 736 }],
732 ], 737 ],
733 }, 738 },
734 } 739 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698