Index: base/base.gypi |
diff --git a/base/base.gypi b/base/base.gypi |
index dd99be3969898cd33610c2c100a44f77e99e8ae9..1c0b7649b5b106f7151aac78f3b05b1857004af1 100644 |
--- a/base/base.gypi |
+++ b/base/base.gypi |
@@ -437,8 +437,7 @@ |
], |
[ 'OS == "android"', { |
'sources/': [ |
- ['exclude', '^debug/stack_trace.cc'], |
- ['exclude', '^debug/stack_trace_posix.cc'], |
+ ['exclude', '^files/file_path_watcher_kqueue.cc'], |
John Grabowski
2011/11/01 23:09:34
I landed a fix for this today; see http://coderevi
Jing Zhao
2011/11/02 16:22:55
Removed.
|
['exclude', '^system_monitor/system_monitor_posix.cc'], |
['include', '^native_library_linux.cc'], |
['include', '^process_util_linux.cc'], |
@@ -595,16 +594,25 @@ |
'defines': [ |
'USE_SYMBOLIZE', |
], |
- 'link_settings': { |
- 'libraries': [ |
- '-llog', |
- ], |
- }, |
'conditions': [ |
[ '_toolset=="host" and host_os=="linux"', { |
'dependencies': [ |
'../build/linux/system.gyp:glib', |
], |
+ 'sources/': [ |
+ ['include', 'atomicops_internals_x86_gcc.cc'], |
+ ], |
+ }], |
+ [ '_toolset=="target"', { |
+ 'sources/': [ |
+ ['exclude', '^debug/stack_trace.cc'], |
+ ['exclude', '^debug/stack_trace_posix.cc'], |
michaelbai
2011/11/01 16:37:59
It seemed that this 'reg' way is not preferred, yo
Jing Zhao
2011/11/02 16:22:55
Done.
|
+ ], |
+ 'link_settings': { |
+ 'libraries': [ |
+ '-llog', |
+ ], |
+ } |
}], |
], |
}], |