Index: base/base.gypi |
diff --git a/base/base.gypi b/base/base.gypi |
index 060b36083068318cb58cebde3eaad20a2f46819c..692fd248f2e82eb5254fc9f5aadaabad5ec05c3f 100644 |
--- a/base/base.gypi |
+++ b/base/base.gypi |
@@ -13,15 +13,6 @@ |
['base_target==1', { |
'sources': [ |
'../build/build_config.h', |
- 'third_party/dmg_fp/dmg_fp.h', |
- 'third_party/dmg_fp/g_fmt.cc', |
- 'third_party/dmg_fp/dtoa_wrapper.cc', |
- 'third_party/icu/icu_utf.cc', |
- 'third_party/icu/icu_utf.h', |
- 'third_party/nspr/prtime.cc', |
- 'third_party/nspr/prtime.h', |
- 'third_party/superfasthash/superfasthash.c', |
- 'third_party/xdg_mime/xdgmime.h', |
'allocator/allocator_extension.cc', |
'allocator/allocator_extension.h', |
'allocator/type_profiler_control.cc', |
@@ -47,10 +38,8 @@ |
'android/fifo_utils.h', |
'android/important_file_writer_android.cc', |
'android/important_file_writer_android.h', |
- 'android/locale_utils.h', |
- 'android/locale_utils.cc', |
- 'android/scoped_java_ref.cc', |
- 'android/scoped_java_ref.h', |
+ 'android/java_handler_thread.cc', |
+ 'android/java_handler_thread.h', |
'android/jni_android.cc', |
'android/jni_android.h', |
'android/jni_array.cc', |
@@ -64,19 +53,21 @@ |
'android/jni_utils.h', |
'android/jni_weak_ref.cc', |
'android/jni_weak_ref.h', |
+ 'android/library_loader/library_load_from_apk_status_codes.h', |
'android/library_loader/library_loader_hooks.cc', |
'android/library_loader/library_loader_hooks.h', |
- 'android/library_loader/library_load_from_apk_status_codes.h', |
+ 'android/locale_utils.cc', |
+ 'android/locale_utils.h', |
'android/memory_pressure_listener_android.cc', |
'android/memory_pressure_listener_android.h', |
- 'android/java_handler_thread.cc', |
- 'android/java_handler_thread.h', |
'android/path_service_android.cc', |
'android/path_service_android.h', |
'android/path_utils.cc', |
'android/path_utils.h', |
'android/record_histogram.cc', |
'android/record_histogram.h', |
+ 'android/scoped_java_ref.cc', |
+ 'android/scoped_java_ref.h', |
'android/sys_utils.cc', |
'android/sys_utils.h', |
'android/thread_utils.h', |
@@ -218,8 +209,8 @@ |
'files/file_util_proxy.h', |
'files/file_util_win.cc', |
'files/file_win.cc', |
- 'files/important_file_writer.h', |
'files/important_file_writer.cc', |
+ 'files/important_file_writer.h', |
'files/memory_mapped_file.cc', |
'files/memory_mapped_file.h', |
'files/memory_mapped_file_posix.cc', |
@@ -284,8 +275,8 @@ |
'mac/launchd.h', |
'mac/libdispatch_task_runner.cc', |
'mac/libdispatch_task_runner.h', |
- 'mac/mac_logging.h', |
'mac/mac_logging.cc', |
+ 'mac/mac_logging.h', |
'mac/mac_util.h', |
'mac/mac_util.mm', |
'mac/mach_logging.cc', |
@@ -377,10 +368,6 @@ |
'message_loop/message_pump_win.cc', |
'message_loop/message_pump_win.h', |
'message_loop/timer_slack.h', |
- 'metrics/sample_map.cc', |
- 'metrics/sample_map.h', |
- 'metrics/sample_vector.cc', |
- 'metrics/sample_vector.h', |
'metrics/bucket_ranges.cc', |
'metrics/bucket_ranges.h', |
'metrics/histogram.cc', |
@@ -395,6 +382,10 @@ |
'metrics/histogram_samples.h', |
'metrics/histogram_snapshot_manager.cc', |
'metrics/histogram_snapshot_manager.h', |
+ 'metrics/sample_map.cc', |
+ 'metrics/sample_map.h', |
+ 'metrics/sample_vector.cc', |
+ 'metrics/sample_vector.h', |
'metrics/sparse_histogram.cc', |
'metrics/sparse_histogram.h', |
'metrics/statistics_recorder.cc', |
@@ -411,6 +402,10 @@ |
'nix/mime_util_xdg.h', |
'nix/xdg_util.cc', |
'nix/xdg_util.h', |
+ 'numerics/safe_conversions.h', |
+ 'numerics/safe_conversions_impl.h', |
+ 'numerics/safe_math.h', |
+ 'numerics/safe_math_impl.h', |
'observer_list.h', |
'observer_list_threadsafe.h', |
'os_compat_android.cc', |
@@ -431,11 +426,11 @@ |
'posix/unix_domain_socket_linux.h', |
'power_monitor/power_monitor.cc', |
'power_monitor/power_monitor.h', |
+ 'power_monitor/power_monitor_device_source.cc', |
+ 'power_monitor/power_monitor_device_source.h', |
'power_monitor/power_monitor_device_source_android.cc', |
'power_monitor/power_monitor_device_source_android.h', |
'power_monitor/power_monitor_device_source_chromeos.cc', |
- 'power_monitor/power_monitor_device_source.cc', |
- 'power_monitor/power_monitor_device_source.h', |
'power_monitor/power_monitor_device_source_ios.mm', |
'power_monitor/power_monitor_device_source_mac.mm', |
'power_monitor/power_monitor_device_source_posix.cc', |
@@ -456,8 +451,8 @@ |
'process/launch_mac.cc', |
'process/launch_posix.cc', |
'process/launch_win.cc', |
- 'process/memory.h', |
'process/memory.cc', |
+ 'process/memory.h', |
'process/memory_linux.cc', |
'process/memory_mac.mm', |
'process/memory_win.cc', |
@@ -480,8 +475,8 @@ |
'process/process_iterator_openbsd.cc', |
'process/process_iterator_win.cc', |
'process/process_linux.cc', |
- 'process/process_metrics.h', |
'process/process_metrics.cc', |
+ 'process/process_metrics.h', |
'process/process_metrics_freebsd.cc', |
'process/process_metrics_ios.cc', |
'process/process_metrics_linux.cc', |
@@ -506,10 +501,6 @@ |
'rand_util_win.cc', |
'run_loop.cc', |
'run_loop.h', |
- 'numerics/safe_conversions.h', |
- 'numerics/safe_conversions_impl.h', |
- 'numerics/safe_math.h', |
- 'numerics/safe_math_impl.h', |
'safe_strerror_posix.cc', |
'safe_strerror_posix.h', |
'scoped_generic.h', |
@@ -536,11 +527,11 @@ |
'strings/string16.cc', |
'strings/string16.h', |
'strings/string_number_conversions.cc', |
- 'strings/string_split.cc', |
- 'strings/string_split.h', |
'strings/string_number_conversions.h', |
'strings/string_piece.cc', |
'strings/string_piece.h', |
+ 'strings/string_split.cc', |
+ 'strings/string_split.h', |
'strings/string_tokenizer.h', |
'strings/string_util.cc', |
'strings/string_util.h', |
@@ -579,8 +570,6 @@ |
'synchronization/waitable_event_watcher_posix.cc', |
'synchronization/waitable_event_watcher_win.cc', |
'synchronization/waitable_event_win.cc', |
- 'system_monitor/system_monitor.cc', |
- 'system_monitor/system_monitor.h', |
'sys_byteorder.h', |
'sys_info.cc', |
'sys_info.h', |
@@ -594,12 +583,23 @@ |
'sys_info_openbsd.cc', |
'sys_info_posix.cc', |
'sys_info_win.cc', |
+ 'system_monitor/system_monitor.cc', |
+ 'system_monitor/system_monitor.h', |
'task/cancelable_task_tracker.cc', |
'task/cancelable_task_tracker.h', |
'task_runner.cc', |
'task_runner.h', |
'task_runner_util.h', |
'template_util.h', |
+ 'third_party/dmg_fp/dmg_fp.h', |
+ 'third_party/dmg_fp/dtoa_wrapper.cc', |
+ 'third_party/dmg_fp/g_fmt.cc', |
+ 'third_party/icu/icu_utf.cc', |
+ 'third_party/icu/icu_utf.h', |
+ 'third_party/nspr/prtime.cc', |
+ 'third_party/nspr/prtime.h', |
+ 'third_party/superfasthash/superfasthash.c', |
+ 'third_party/xdg_mime/xdgmime.h', |
satorux1
2015/02/13 02:27:53
fixed!
|
'thread_task_runner_handle.cc', |
'thread_task_runner_handle.h', |
'threading/non_thread_safe.h', |
@@ -634,12 +634,12 @@ |
'threading/thread_local_storage_posix.cc', |
'threading/thread_local_storage_win.cc', |
'threading/thread_local_win.cc', |
- 'threading/thread_restrictions.h', |
'threading/thread_restrictions.cc', |
+ 'threading/thread_restrictions.h', |
'threading/watchdog.cc', |
'threading/watchdog.h', |
- 'threading/worker_pool.h', |
'threading/worker_pool.cc', |
+ 'threading/worker_pool.h', |
'threading/worker_pool_posix.cc', |
'threading/worker_pool_posix.h', |
'threading/worker_pool_win.cc', |
@@ -685,10 +685,10 @@ |
'tracking_info.cc', |
'tracking_info.h', |
'tuple.h', |
- 'values.cc', |
- 'values.h', |
'value_conversions.cc', |
'value_conversions.h', |
+ 'values.cc', |
+ 'values.h', |
'version.cc', |
'version.h', |
'vlog.cc', |
@@ -791,6 +791,7 @@ |
'files/file_util_posix.cc', |
'files/file_util_proxy.cc', |
'files/important_file_writer.cc', |
+ 'files/scoped_temp_dir.cc', |
'memory/shared_memory_posix.cc', |
'native_library_posix.cc', |
'path_service.cc', |
@@ -804,7 +805,6 @@ |
'process/process_posix.cc', |
'rand_util_posix.cc', |
'scoped_native_library.cc', |
- 'files/scoped_temp_dir.cc', |
'sys_info.cc', |
'sys_info_posix.cc', |
'third_party/dynamic_annotations/dynamic_annotations.c', |
@@ -815,10 +815,10 @@ |
}], |
['OS == "android" and _toolset == "target" and >(nacl_untrusted_build)==0', { |
'sources': [ |
- 'memory/discardable_memory_ashmem_allocator.cc', |
- 'memory/discardable_memory_ashmem_allocator.h', |
'memory/discardable_memory_ashmem.cc', |
'memory/discardable_memory_ashmem.h', |
+ 'memory/discardable_memory_ashmem_allocator.cc', |
+ 'memory/discardable_memory_ashmem_allocator.h', |
], |
}], |
['OS == "android" and >(nacl_untrusted_build)==0', { |