Index: base/base.gypi |
diff --git a/base/base.gypi b/base/base.gypi |
index 63c2b931c1ac630fc734112a3c3a5860ed0879a7..19fdcb91b3cd10eb71d77fc522e98f2cd65d4aeb 100644 |
--- a/base/base.gypi |
+++ b/base/base.gypi |
@@ -379,14 +379,6 @@ |
'power_monitor/power_monitor_posix.cc', |
'power_monitor/power_monitor_win.cc', |
'power_monitor/power_observer.h', |
- 'process.h', |
- 'process_info.h', |
- 'process_info_mac.cc', |
- 'process_info_win.cc', |
- 'process_linux.cc', |
- 'process_posix.cc', |
- 'process_util.h', |
- 'process_win.cc', |
'process/internal_linux.cc', |
'process/internal_linux.h', |
'process/kill.cc', |
@@ -403,12 +395,16 @@ |
'process/memory_linux.cc', |
'process/memory_mac.mm', |
'process/memory_win.cc', |
+ 'process/process.h', |
'process/process_handle_freebsd.cc', |
'process/process_handle_linux.cc', |
'process/process_handle_mac.cc', |
'process/process_handle_openbsd.cc', |
'process/process_handle_posix.cc', |
'process/process_handle_win.cc', |
+ 'process/process_info.h', |
+ 'process/process_info_mac.cc', |
+ 'process/process_info_win.cc', |
'process/process_iterator.cc', |
'process/process_iterator.h', |
'process/process_iterator_freebsd.cc', |
@@ -416,6 +412,7 @@ |
'process/process_iterator_mac.cc', |
'process/process_iterator_openbsd.cc', |
'process/process_iterator_win.cc', |
+ 'process/process_linux.cc', |
'process/process_metrics.h', |
'process/process_metrics_freebsd.cc', |
'process/process_metrics_ios.cc', |
@@ -424,6 +421,8 @@ |
'process/process_metrics_openbsd.cc', |
'process/process_metrics_posix.cc', |
'process/process_metrics_win.cc', |
+ 'process/process_posix.cc', |
+ 'process/process_win.cc', |
'profiler/scoped_profile.cc', |
'profiler/scoped_profile.h', |
'profiler/alternate_timer.cc', |
@@ -701,9 +700,9 @@ |
'path_service.cc', |
'posix/unix_domain_socket_linux.cc', |
'process/kill_posix.cc', |
- 'process/process_metrics_posix.cc', |
'process/launch_posix.cc', |
- 'process_posix.cc', |
+ 'process/process_metrics_posix.cc', |
+ 'process/process_posix.cc', |
'rand_util_posix.cc', |
'scoped_native_library.cc', |
'files/scoped_temp_dir.cc', |
@@ -726,7 +725,6 @@ |
'sources/': [ |
['include', '^debug/proc_maps_linux\\.cc$'], |
['include', '^files/file_path_watcher_linux\\.cc$'], |
- ['include', '^process_util_linux\\.cc$'], |
['include', '^process/memory_linux\\.cc$'], |
['include', '^process/internal_linux\\.cc$'], |
['include', '^process/process_handle_linux\\.cc$'], |
@@ -766,14 +764,12 @@ |
['include', '^threading/platform_thread_mac\\.'], |
['include', '^time/time_mac\\.'], |
['include', '^worker_pool_mac\\.'], |
- # Exclude all process_util except the minimal implementation |
+ # Exclude all process/ except the minimal implementation |
# needed on iOS (mostly for unit tests). |
- ['exclude', '^process_util'], |
- ['include', '^process_util_ios\\.mm$'], |
- ['exclude', '^process/launch_posix\\.cc$'], |
- ['exclude', '^process/launch_mac\\.cc$'], |
- ['exclude', '^process/memory_mac\\.mm$'], |
- ['include', '^process/process_handle_posix\\.cc$'], |
+ ['exclude', '^process/.*'], |
+ ['include', '^process/.*_ios\.(cc|mm)$'], |
+ ['include', '^process/memory_stubs\.cc$'], |
+ ['include', '^process/process_handle_posix\.cc$'], |
], |
'sources': [ |
'process/memory_stubs.cc', |
@@ -858,8 +854,7 @@ |
['exclude', '^files/file_path_watcher_linux\\.cc$'], |
['exclude', '^files/file_path_watcher_stub\\.cc$'], |
['exclude', '^file_util_linux\\.cc$'], |
- ['exclude', '^process_linux\\.cc$'], |
- ['exclude', '^process_util_linux\\.cc$'], |
+ ['exclude', '^process/process_linux\\.cc$'], |
['exclude', '^sys_info_linux\\.cc$'], |
], |
}], |