diff options
Diffstat (limited to 'chromium/base/base.gypi')
| -rw-r--r-- | chromium/base/base.gypi | 194 |
1 files changed, 102 insertions, 92 deletions
diff --git a/chromium/base/base.gypi b/chromium/base/base.gypi index 416a7e5aa6e..a39952d5c76 100644 --- a/chromium/base/base.gypi +++ b/chromium/base/base.gypi @@ -3,6 +3,9 @@ # found in the LICENSE file. { + 'includes': [ + 'trace_event/trace_event.gypi', + ], 'target_defaults': { 'variables': { 'base_target': 0, @@ -13,21 +16,16 @@ ['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', 'allocator/type_profiler_control.h', + 'android/animation_frame_time_histogram.cc', + 'android/animation_frame_time_histogram.h', 'android/application_status_listener.cc', 'android/application_status_listener.h', + 'android/base_jni_onload.cc', + 'android/base_jni_onload.h', 'android/base_jni_registrar.cc', 'android/base_jni_registrar.h', 'android/build_info.cc', @@ -45,10 +43,10 @@ '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/java_runtime.cc', + 'android/java_runtime.h', 'android/jni_android.cc', 'android/jni_android.h', 'android/jni_array.cc', @@ -61,17 +59,25 @@ '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/library_loader/library_prefetcher.cc', + 'android/library_loader/library_prefetcher.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/record_user_action.cc', + 'android/record_user_action.h', + 'android/scoped_java_ref.cc', + 'android/scoped_java_ref.h', 'android/sys_utils.cc', 'android/sys_utils.h', 'android/thread_utils.h', @@ -122,6 +128,8 @@ 'callback_internal.h', 'callback_list.h', 'cancelable_callback.h', + 'chromeos/memory_pressure_monitor.cc', + 'chromeos/memory_pressure_monitor.h', 'command_line.cc', 'command_line.h', 'compiler_specific.h', @@ -166,19 +174,6 @@ 'debug/stack_trace_win.cc', 'debug/task_annotator.cc', 'debug/task_annotator.h', - 'debug/trace_event.h', - 'debug/trace_event_android.cc', - 'debug/trace_event_argument.cc', - 'debug/trace_event_argument.h', - 'debug/trace_event_impl.cc', - 'debug/trace_event_impl.h', - 'debug/trace_event_impl_constants.cc', - 'debug/trace_event_synthetic_delay.cc', - 'debug/trace_event_synthetic_delay.h', - 'debug/trace_event_system_stats_monitor.cc', - 'debug/trace_event_memory.cc', - 'debug/trace_event_memory.h', - 'debug/trace_event_win.cc', 'deferred_sequenced_task_runner.cc', 'deferred_sequenced_task_runner.h', 'environment.cc', @@ -214,6 +209,8 @@ 'files/file_posix.cc', 'files/file_proxy.cc', 'files/file_proxy.h', + 'files/file_tracing.cc', + 'files/file_tracing.h', 'files/file_util.cc', 'files/file_util.h', 'files/file_util_android.cc', @@ -224,8 +221,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', @@ -234,7 +231,6 @@ 'files/scoped_file.h', 'files/scoped_temp_dir.cc', 'files/scoped_temp_dir.h', - 'float_util.h', 'format_macros.h', 'gtest_prod_util.h', 'guid.cc', @@ -244,12 +240,17 @@ 'hash.cc', 'hash.h', 'id_map.h', + 'ios/block_types.h', + 'ios/crb_protocol_observers.h', + 'ios/crb_protocol_observers.mm', 'ios/device_util.h', 'ios/device_util.mm', 'ios/ios_util.h', 'ios/ios_util.mm', 'ios/scoped_critical_action.h', 'ios/scoped_critical_action.mm', + 'ios/weak_nsobject.h', + 'ios/weak_nsobject.mm', 'json/json_file_value_serializer.cc', 'json/json_file_value_serializer.h', 'json/json_parser.cc', @@ -258,6 +259,7 @@ 'json/json_reader.h', 'json/json_string_value_serializer.cc', 'json/json_string_value_serializer.h', + 'json/json_value_converter.cc', 'json/json_value_converter.h', 'json/json_writer.cc', 'json/json_writer.h', @@ -278,6 +280,8 @@ 'mac/bundle_locations.mm', 'mac/close_nocancel.cc', 'mac/cocoa_protocols.h', + 'mac/dispatch_source_mach.cc', + 'mac/dispatch_source_mach.h', 'mac/foundation_util.h', 'mac/foundation_util.mm', 'mac/launch_services_util.cc', @@ -286,12 +290,14 @@ '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', 'mac/mach_logging.h', + 'mac/memory_pressure_monitor.cc', + 'mac/memory_pressure_monitor.h', 'mac/objc_property_releaser.h', 'mac/objc_property_releaser.mm', 'mac/os_crash_dumps.cc', @@ -326,31 +332,22 @@ 'memory/aligned_memory.h', 'memory/discardable_memory.cc', 'memory/discardable_memory.h', - 'memory/discardable_memory_android.cc', - 'memory/discardable_memory_emulated.cc', - 'memory/discardable_memory_emulated.h', - 'memory/discardable_memory_linux.cc', - 'memory/discardable_memory_mac.cc', - 'memory/discardable_memory_manager.cc', - 'memory/discardable_memory_manager.h', - 'memory/discardable_memory_shmem.cc', - 'memory/discardable_memory_shmem.h', - 'memory/discardable_memory_shmem_allocator.cc', - 'memory/discardable_memory_shmem_allocator.h', - 'memory/discardable_memory_win.cc', + 'memory/discardable_memory_allocator.cc', + 'memory/discardable_memory_allocator.h', 'memory/discardable_shared_memory.cc', 'memory/discardable_shared_memory.h', 'memory/linked_ptr.h', 'memory/manual_constructor.h', 'memory/memory_pressure_listener.cc', 'memory/memory_pressure_listener.h', + 'memory/memory_pressure_monitor.cc', + 'memory/memory_pressure_monitor.h', 'memory/raw_scoped_refptr_mismatch_checker.h', 'memory/ref_counted.cc', 'memory/ref_counted.h', 'memory/ref_counted_delete_on_message_loop.h', 'memory/ref_counted_memory.cc', 'memory/ref_counted_memory.h', - 'memory/scoped_open_process.h', 'memory/scoped_policy.h', 'memory/scoped_ptr.h', 'memory/scoped_vector.h', @@ -380,10 +377,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', @@ -393,23 +386,25 @@ 'metrics/histogram_delta_serialization.cc', 'metrics/histogram_delta_serialization.h', 'metrics/histogram_flattener.h', + 'metrics/histogram_macros.h', 'metrics/histogram_samples.cc', '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', 'metrics/statistics_recorder.h', - 'metrics/stats_counters.cc', - 'metrics/stats_counters.h', - 'metrics/stats_table.cc', - 'metrics/stats_table.h', 'metrics/user_metrics.cc', 'metrics/user_metrics.h', 'metrics/user_metrics_action.h', 'move.h', 'native_library.h', + 'native_library_ios.mm', 'native_library_mac.mm', 'native_library_posix.cc', 'native_library_win.cc', @@ -417,6 +412,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', @@ -437,11 +436,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', @@ -462,8 +461,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', @@ -486,8 +485,9 @@ 'process/process_iterator_openbsd.cc', 'process/process_iterator_win.cc', 'process/process_linux.cc', - 'process/process_metrics.h', + 'process/process_mac.cc', 'process/process_metrics.cc', + 'process/process_metrics.h', 'process/process_metrics_freebsd.cc', 'process/process_metrics_ios.cc', 'process/process_metrics_linux.cc', @@ -499,10 +499,16 @@ 'process/process_win.cc', 'profiler/alternate_timer.cc', 'profiler/alternate_timer.h', + 'profiler/native_stack_sampler.cc', + 'profiler/native_stack_sampler.h', 'profiler/scoped_profile.cc', 'profiler/scoped_profile.h', 'profiler/scoped_tracker.cc', 'profiler/scoped_tracker.h', + 'profiler/stack_sampling_profiler.cc', + 'profiler/stack_sampling_profiler.h', + 'profiler/stack_sampling_profiler_posix.cc', + 'profiler/stack_sampling_profiler_win.cc', 'profiler/tracked_time.cc', 'profiler/tracked_time.h', 'rand_util.cc', @@ -512,10 +518,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', @@ -542,11 +544,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', @@ -585,8 +587,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', @@ -600,12 +600,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', 'thread_task_runner_handle.cc', 'thread_task_runner_handle.h', 'threading/non_thread_safe.h', @@ -613,6 +624,8 @@ 'threading/non_thread_safe_impl.h', 'threading/platform_thread.h', 'threading/platform_thread_android.cc', + 'threading/platform_thread_internal_posix.cc', + 'threading/platform_thread_internal_posix.h', 'threading/platform_thread_linux.cc', 'threading/platform_thread_mac.mm', 'threading/platform_thread_posix.cc', @@ -640,12 +653,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', @@ -676,10 +689,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', @@ -697,6 +710,8 @@ 'win/iat_patch_function.h', 'win/iunknown_impl.cc', 'win/iunknown_impl.h', + 'win/memory_pressure_monitor.cc', + 'win/memory_pressure_monitor.h', 'win/message_window.cc', 'win/message_window.h', 'win/metro.cc', @@ -733,6 +748,7 @@ 'win/windows_version.h', 'win/wrapped_window_proc.cc', 'win/wrapped_window_proc.h', + '<@(trace_event_sources)', ], 'defines': [ 'BASE_IMPLEMENTATION', @@ -770,6 +786,7 @@ 'allocator/type_profiler_control.h', 'base_paths.cc', 'cpu.cc', + 'debug/stack_trace.cc', 'debug/stack_trace_posix.cc', 'files/file_enumerator_posix.cc', 'files/file_path_watcher_fsevents.cc', @@ -780,17 +797,22 @@ 'files/file_util.cc', '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', 'posix/unix_domain_socket_linux.cc', + 'process/kill.cc', 'process/kill_posix.cc', + 'process/launch.cc', 'process/launch_posix.cc', + 'process/process_metrics.cc', 'process/process_metrics_posix.cc', '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', ], @@ -798,14 +820,6 @@ ['include', '^threading/platform_thread_linux\\.cc$'], ], }], - ['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', - ], - }], ['OS == "android" and >(nacl_untrusted_build)==0', { 'sources!': [ 'base_paths_posix.cc', @@ -841,13 +855,6 @@ ['include', '^threading/platform_thread_linux\\.cc$'], ], }], - ['OS == "android" and <(android_webview_build)==1', { - 'defines': [ - # WebView builds as part of the system which already has sincos; - # avoid defining it again as it causes a linker warning. - 'ANDROID_SINCOS_PROVIDED', - ], - }], ['<(chromeos) == 1', { 'sources!': [ 'power_monitor/power_monitor_device_source_posix.cc', @@ -870,7 +877,7 @@ ['include', '^mac/scoped_mach_vm\\.'], ['include', '^mac/scoped_nsautorelease_pool\\.'], ['include', '^mac/scoped_nsobject\\.'], - ['include', '^memory/discardable_memory_mac\\.'], + ['include', '^mac/scoped_objc_class_swizzler\\.'], ['include', '^message_loop/message_pump_mac\\.'], ['include', '^strings/sys_string_conversions_mac\\.'], ['include', '^threading/platform_thread_mac\\.'], @@ -882,6 +889,8 @@ ['include', '^process/.*_ios\.(cc|mm)$'], ['include', '^process/memory_stubs\.cc$'], ['include', '^process/process_handle_posix\.cc$'], + ['include', '^process/process_metrics\\.cc$'], + ['exclude', '^threading/platform_thread_internal_posix\\.(h|cc)'], ['exclude', 'files/file_path_watcher_fsevents.cc'], ['exclude', 'files/file_path_watcher_fsevents.h'], ['include', 'files/file_path_watcher_mac.cc'], @@ -920,7 +929,6 @@ '<(DEPTH)/third_party/wtl/include', ], 'sources!': [ - 'event_recorder_stubs.cc', 'files/file_path_watcher_fsevents.cc', 'files/file_path_watcher_fsevents.h', 'files/file_path_watcher_kqueue.cc', @@ -949,15 +957,12 @@ ], }], ['(OS == "mac" or OS == "ios") and >(nacl_untrusted_build)==0', { - 'sources': [ - 'memory/discardable_memory_mach.cc', - 'memory/discardable_memory_mach.h', - ], 'sources/': [ - ['exclude', '^files/file_path_watcher_stub\\.cc$'], ['exclude', '^base_paths_posix\\.cc$'], + ['exclude', '^files/file_path_watcher_stub\\.cc$'], ['exclude', '^native_library_posix\\.cc$'], ['exclude', '^strings/sys_string_conversions_posix\\.cc$'], + ['exclude', '^threading/platform_thread_internal_posix\\.cc$'], ], }], ['<(os_bsd)==1 and >(nacl_untrusted_build)==0', { @@ -977,6 +982,11 @@ ['OS == "win" and >(nacl_untrusted_build)==1', { 'sources/': [ ['exclude', '\\.h$'] ], }], + # Enable more direct string conversions on platforms with native utf8 + # strings + ['OS=="mac" or OS=="ios" or <(chromeos)==1 or <(chromecast)==1', { + 'defines': ['SYSTEM_NATIVE_UTF8'], + }], ], }], ['base_i18n_target==1', { |