Chromium Code Reviews| Index: base/base.gypi |
| diff --git a/base/base.gypi b/base/base.gypi |
| index 94cf15b63b27f9ba6e7d3c77e1bd0e3ce0da25cf..6eb771a004fe5cf767f4a401e8f4f30533e78a30 100644 |
| --- a/base/base.gypi |
| +++ b/base/base.gypi |
| @@ -43,6 +43,7 @@ |
| 'base_export.h', |
| 'base_paths.cc', |
| 'base_paths.h', |
| + 'base_paths_android.cc', |
| 'base_paths_mac.h', |
| 'base_paths_mac.mm', |
| 'base_paths_linux.cc', |
| @@ -78,6 +79,7 @@ |
| 'debug/profiler.h', |
| 'debug/stack_trace.cc', |
| 'debug/stack_trace.h', |
| + 'debug/stack_trace_android.cc', |
| 'debug/stack_trace_posix.cc', |
| 'debug/stack_trace_win.cc', |
| 'debug/trace_event_win.cc', |
| @@ -94,6 +96,7 @@ |
| 'file_path.h', |
| 'file_util.cc', |
| 'file_util.h', |
| + 'file_util_android.cc', |
| 'file_util_deprecated.h', |
| 'file_util_linux.cc', |
| 'file_util_mac.mm', |
| @@ -194,6 +197,8 @@ |
| 'native_library_win.cc', |
| 'observer_list.h', |
| 'observer_list_threadsafe.h', |
| + 'os_compat_android.cc', |
| + 'os_compat_android.h', |
| 'path_service.cc', |
| 'path_service.h', |
| 'pickle.cc', |
| @@ -228,6 +233,7 @@ |
| 'sha1_portable.cc', |
| 'sha1_win.cc', |
| 'shared_memory.h', |
| + 'shared_memory_android.cc', |
| 'shared_memory_posix.cc', |
| 'shared_memory_win.cc', |
| 'spin_wait.h', |
| @@ -265,6 +271,7 @@ |
| 'synchronization/waitable_event_win.cc', |
| 'system_monitor/system_monitor.cc', |
| 'system_monitor/system_monitor.h', |
| + 'system_monitor/system_monitor_android.cc', |
| 'system_monitor/system_monitor_mac.mm', |
| 'system_monitor/system_monitor_posix.cc', |
| 'system_monitor/system_monitor_win.cc', |
| @@ -417,6 +424,26 @@ |
| ], |
| }, |
| ], |
| + [ 'OS == "android"', { |
| + 'sources/': [ |
| + ['exclude', '^debug/stack_trace.cc'], |
| + ['exclude', '^debug/stack_trace_posix.cc'], |
| + ['exclude', '^system_monitor/system_monitor_posix.cc'], |
| + ['include', '^native_library_linux.cc'], |
| + ['include', '^process_util_linux.cc'], |
| + ['include', '^sys_info_linux.cc'], |
| + ['include', '^sys_string_conversions_linux.cc'], |
| + ['include', '^worker_pool_linux.cc'], |
| + # TODO(michaelbai): Remove the below once the JNI is ready. |
| + ['exclude', '^android/'], |
| + ['exclude', '^message_pump_android.cc'], |
| + ['exclude', '^base_paths_android.cc'], |
| + ['exclude', '^debug/stack_trace_android.cc'], |
|
brettw
2011/09/28 19:49:28
Why do you add this file only to exclude it?
michaelbai
2011/09/28 21:22:11
Not sure I fully understood your question, All the
|
| + ], |
| + 'sources': [ |
| + 'files/file_path_watcher_stub.cc', |
|
brettw
2011/09/28 19:49:28
Why isn't this in the main list of all files above
michaelbai
2011/09/28 21:22:11
I check it again, it seemed that this file has bee
brettw
2011/09/28 21:38:49
The style is to have all files in the main list, a
michaelbai
2011/09/28 23:04:34
Done.
|
| + ], |
| + }], |
| [ 'OS != "mac"', { |
| 'sources!': [ |
| 'mac/scoped_aedesc.h' |
| @@ -536,6 +563,27 @@ |
| ['exclude', '_nss\.cc$'], |
| ], |
| }], |
| + [ 'OS == "android"', { |
| + 'dependencies': [ |
| + 'symbolize', |
| + '../third_party/ashmem/ashmem.gyp:ashmem#target', |
| + ], |
| + 'defines': [ |
| + 'USE_SYMBOLIZE', |
| + ], |
| + 'link_settings': { |
| + 'libraries': [ |
| + '-llog', |
| + ], |
| + }, |
| + 'conditions': [ |
| + [ '_toolset=="host" and host_os=="linux"', { |
| + 'dependencies': [ |
| + '../build/linux/system.gyp:glib', |
| + ], |
| + }], |
| + ], |
| + }], |
| [ 'OS == "freebsd" or OS == "openbsd"', { |
| 'link_settings': { |
| 'libraries': [ |
| @@ -600,6 +648,8 @@ |
| 'linux_util.h', |
| 'md5.cc', |
| 'md5.h', |
| + 'message_pump_android.cc', |
| + 'message_pump_android.h', |
| 'message_pump_glib.cc', |
| 'message_pump_glib.h', |
| 'message_pump_gtk.cc', |