| Index: base/base.gypi
|
| diff --git a/base/base.gypi b/base/base.gypi
|
| index 7bfd924f655dc705413149bb2ea1daee64c3219c..1a36f27c2b9b0566cde0543870d6ffdb487f5d88 100644
|
| --- a/base/base.gypi
|
| +++ b/base/base.gypi
|
| @@ -199,9 +199,6 @@
|
| 'guid_win.cc',
|
| 'hash.cc',
|
| 'hash.h',
|
| - 'hi_res_timer_manager_posix.cc',
|
| - 'hi_res_timer_manager_win.cc',
|
| - 'hi_res_timer_manager.h',
|
| 'id_map.h',
|
| 'ini_parser.cc',
|
| 'ini_parser.h',
|
| @@ -345,6 +342,10 @@
|
| 'native_library_mac.mm',
|
| 'native_library_posix.cc',
|
| 'native_library_win.cc',
|
| + 'nix/mime_util_xdg.cc',
|
| + 'nix/mime_util_xdg.h',
|
| + 'nix/xdg_util.cc',
|
| + 'nix/xdg_util.h',
|
| 'observer_list.h',
|
| 'observer_list_threadsafe.h',
|
| 'os_compat_android.cc',
|
| @@ -555,14 +556,16 @@
|
| 'time/default_tick_clock.h',
|
| 'time/tick_clock.cc',
|
| 'time/tick_clock.h',
|
| - # TODO(akalin): Move time* into time/.
|
| - 'time.cc',
|
| - 'time.h',
|
| - 'time_mac.cc',
|
| - 'time_posix.cc',
|
| - 'time_win.cc',
|
| - 'timer.cc',
|
| - 'timer.h',
|
| + 'time/time.cc',
|
| + 'time/time.h',
|
| + 'time/time_mac.cc',
|
| + 'time/time_posix.cc',
|
| + 'time/time_win.cc',
|
| + 'timer/hi_res_timer_manager_posix.cc',
|
| + 'timer/hi_res_timer_manager_win.cc',
|
| + 'timer/hi_res_timer_manager.h',
|
| + 'timer/timer.cc',
|
| + 'timer/timer.h',
|
| 'tracked_objects.cc',
|
| 'tracked_objects.h',
|
| 'tracking_info.cc',
|
| @@ -576,10 +579,6 @@
|
| 'version.h',
|
| 'vlog.cc',
|
| 'vlog.h',
|
| - 'nix/mime_util_xdg.cc',
|
| - 'nix/mime_util_xdg.h',
|
| - 'nix/xdg_util.cc',
|
| - 'nix/xdg_util.h',
|
| 'win/enum_variant.cc',
|
| 'win/enum_variant.h',
|
| 'win/event_trace_consumer.h',
|
| @@ -748,9 +747,9 @@
|
| ['include', '^mac/scoped_nsobject\\.'],
|
| ['include', '^memory/discardable_memory_mac\\.'],
|
| ['include', '^message_loop/message_pump_mac\\.'],
|
| - ['include', '^threading/platform_thread_mac\\.'],
|
| ['include', '^strings/sys_string_conversions_mac\\.'],
|
| - ['include', '^time_mac\\.'],
|
| + ['include', '^threading/platform_thread_mac\\.'],
|
| + ['include', '^time/time_mac\\.'],
|
| ['include', '^worker_pool_mac\\.'],
|
| # Exclude all process_util except the minimal implementation
|
| # needed on iOS (mostly for unit tests).
|
|
|