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

Unified 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, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/base.gyp ('k') | base/base_untrusted.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index 2ee97d3681efdd996a8b8a3b960619fafb8658c3..fd455abf2dba07f7e902a11885cf87be8efcc2c8 100644
--- a/base/base.gypi
+++ b/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/'],
+ ],
+ }],
],
}],
],
« no previous file with comments | « base/base.gyp ('k') | base/base_untrusted.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698