Chromium Code Reviews| Index: base/base.gypi |
| diff --git a/base/base.gypi b/base/base.gypi |
| index 5449329f0a2a9d3b8ba56c156cf9c9080f269a3e..fb6391b2feea8b110bf80db97713ba0306ac7fea 100644 |
| --- a/base/base.gypi |
| +++ b/base/base.gypi |
| @@ -453,6 +453,7 @@ |
| 'sources/': [ |
| ['include', '^process_util_linux\\.cc$'], |
| ['include', '^sys_info_linux\\.cc$'], |
| + ['include', '^sys_string_conversions_posix.cc'], |
|
Mark Mentovai
2011/11/18 19:03:16
Follow the pattern of the lines around you. Fully
bulach
2011/11/21 12:48:13
Done.
|
| ['include', '^worker_pool_linux\\.cc$'], |
| # TODO(michaelbai): The below files are excluded because of the |
| # missing JNI, add them back when JNI is ready. |
| @@ -600,10 +601,40 @@ |
| ['exclude', '_nss\.cc$'], |
| ], |
| }], |
| - [ 'OS == "android"', { |
| + [ 'OS == "android" and _toolset == "host"', { |
| + # Base for host support is the minimum required to run the |
| + # ssl false start blacklist tool. We'll require further changes |
|
Mark Mentovai
2011/11/18 19:03:16
Avoid using “we” and “our” incomments.
bulach
2011/11/21 12:48:13
Done.
|
| + # to generically support host builds (and tests). |
| + # Note: when building for host, gyp has OS == "android", |
| + # hence the *_android.cc files are included but the actual code |
| + # doesn't have OS_ANDROID / ANDROID defined. |
| + 'conditions': [ |
| + ['host_os == "linux"', { |
| + 'sources/': [ |
| + ['include', 'atomicops_internals_x86_gcc\\.cc'], |
|
Mark Mentovai
2011/11/18 19:03:16
^$ anchors on each end.
bulach
2011/11/21 12:48:13
Done.
|
| + ], |
| + 'dependencies': [ |
| + '../build/linux/system.gyp:glib', |
| + ], |
| + 'export_dependent_settings': [ |
| + '../build/linux/system.gyp:glib', |
| + ], |
| + }], |
| + ['host_os == "mac"', { |
| + 'sources/': [ |
| + ['exclude', '^native_library_linux.cc'], |
|
Mark Mentovai
2011/11/18 19:03:16
\\. and $ through line 629.
michaelbai
2011/11/18 23:58:16
Hi Mark,
Should 'sources!' be used here instead o
bulach
2011/11/21 12:48:13
Done.
bulach
2011/11/21 12:48:13
afaict, the order that 'sources', 'sources!' and '
Mark Mentovai
2011/11/21 13:33:55
michaelbai wrote:
|
| + ['exclude', '^process_util_linux.cc'], |
| + ['exclude', '^sys_info_linux.cc'], |
| + ['exclude', '^sys_string_conversions_linux.cc'], |
| + ['exclude', '^worker_pool_linux.cc'], |
| + ], |
| + }], |
| + ], |
| + }], |
| + [ 'OS == "android" and _toolset == "target"', { |
| 'dependencies': [ |
| 'symbolize', |
| - '../third_party/ashmem/ashmem.gyp:ashmem#target', |
| + '../third_party/ashmem/ashmem.gyp:ashmem', |
| ], |
| 'defines': [ |
| 'USE_SYMBOLIZE', |
| @@ -613,12 +644,9 @@ |
| '-llog', |
| ], |
| }, |
| - 'conditions': [ |
| - [ '_toolset=="host" and host_os=="linux"', { |
| - 'dependencies': [ |
| - '../build/linux/system.gyp:glib', |
| - ], |
| - }], |
| + 'sources!': [ |
| + 'debug/stack_trace.cc', |
| + 'debug/stack_trace_posix.cc', |
| ], |
| }], |
| [ 'os_bsd==1', { |