diff options
Diffstat (limited to 'chromium/base/base.gypi')
| -rw-r--r-- | chromium/base/base.gypi | 224 |
1 files changed, 138 insertions, 86 deletions
diff --git a/chromium/base/base.gypi b/chromium/base/base.gypi index 11edab00968..c033dcbce1b 100644 --- a/chromium/base/base.gypi +++ b/chromium/base/base.gypi @@ -6,6 +6,7 @@ 'target_defaults': { 'variables': { 'base_target': 0, + 'base_i18n_target': 0, }, 'target_conditions': [ # This part is shared between the targets defined below. @@ -17,24 +18,16 @@ 'third_party/dmg_fp/dtoa_wrapper.cc', 'third_party/icu/icu_utf.cc', 'third_party/icu/icu_utf.h', - 'third_party/nspr/prcpucfg.h', - 'third_party/nspr/prcpucfg_freebsd.h', - 'third_party/nspr/prcpucfg_linux.h', - 'third_party/nspr/prcpucfg_mac.h', - 'third_party/nspr/prcpucfg_nacl.h', - 'third_party/nspr/prcpucfg_openbsd.h', - 'third_party/nspr/prcpucfg_solaris.h', - 'third_party/nspr/prcpucfg_win.h', 'third_party/nspr/prtime.cc', 'third_party/nspr/prtime.h', - 'third_party/nspr/prtypes.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/activity_status.cc', - 'android/activity_status.h', + 'android/application_status_listener.cc', + 'android/application_status_listener.h', 'android/base_jni_registrar.cc', 'android/base_jni_registrar.h', 'android/build_info.cc', @@ -44,6 +37,8 @@ 'android/content_uri_utils.cc', 'android/content_uri_utils.h', 'android/cpu_features.cc', + 'android/event_log.cc', + 'android/event_log.h', 'android/fifo_utils.cc', 'android/fifo_utils.h', 'android/important_file_writer_android.cc', @@ -54,12 +49,14 @@ 'android/jni_android.h', 'android/jni_array.cc', 'android/jni_array.h', - 'android/jni_helper.cc', - 'android/jni_helper.h', 'android/jni_registrar.cc', 'android/jni_registrar.h', 'android/jni_string.cc', 'android/jni_string.h', + 'android/jni_weak_ref.cc', + 'android/jni_weak_ref.h', + 'android/library_loader/library_loader_hooks.cc', + 'android/library_loader/library_loader_hooks.h', 'android/memory_pressure_listener_android.cc', 'android/memory_pressure_listener_android.h', 'android/java_handler_thread.cc', @@ -71,6 +68,8 @@ 'android/sys_utils.cc', 'android/sys_utils.h', 'android/thread_utils.h', + 'android/trace_event_binding.cc', + 'android/trace_event_binding.h', 'at_exit.cc', 'at_exit.h', 'atomic_ref_count.h', @@ -84,6 +83,8 @@ 'atomicops_internals_x86_msvc.h', 'barrier_closure.cc', 'barrier_closure.h', + 'base64.cc', + 'base64.h', 'base_export.h', 'base_paths.cc', 'base_paths.h', @@ -96,9 +97,9 @@ 'base_paths_win.cc', 'base_paths_win.h', 'base_switches.h', - 'base64.cc', - 'base64.h', 'basictypes.h', + 'big_endian.cc', + 'big_endian.h', 'bind.h', 'bind_helpers.cc', 'bind_helpers.h', @@ -126,17 +127,21 @@ 'cpu.cc', 'cpu.h', 'critical_closure.h', - 'critical_closure_ios.mm', + 'critical_closure_internal_ios.mm', 'debug/alias.cc', 'debug/alias.h', + 'debug/asan_invalid_access.cc', + 'debug/asan_invalid_access.h', 'debug/crash_logging.cc', 'debug/crash_logging.h', - 'debug/debug_on_start_win.cc', - 'debug/debug_on_start_win.h', 'debug/debugger.cc', 'debug/debugger.h', 'debug/debugger_posix.cc', 'debug/debugger_win.cc', + 'debug/dump_without_crashing.cc', + 'debug/dump_without_crashing.h', + 'debug/gdi_debug_util_win.cc', + 'debug/gdi_debug_util_win.h', # This file depends on files from the 'allocator' target, # but this target does not depend on 'allocator' (see # allocator.gyp for details). @@ -149,7 +154,6 @@ 'debug/stack_trace.cc', 'debug/stack_trace.h', 'debug/stack_trace_android.cc', - 'debug/stack_trace_ios.mm', 'debug/stack_trace_posix.cc', 'debug/stack_trace_win.cc', 'debug/trace_event.h', @@ -157,6 +161,8 @@ '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', @@ -192,11 +198,17 @@ 'files/file_path_constants.cc', 'files/file_path_watcher.cc', 'files/file_path_watcher.h', + 'files/file_path_watcher_fsevents.cc', + 'files/file_path_watcher_fsevents.h', 'files/file_path_watcher_kqueue.cc', + 'files/file_path_watcher_kqueue.h', 'files/file_path_watcher_linux.cc', + 'files/file_path_watcher_mac.cc', 'files/file_path_watcher_stub.cc', 'files/file_path_watcher_win.cc', 'files/file_posix.cc', + 'files/file_proxy.cc', + 'files/file_proxy.h', 'files/file_util_proxy.cc', 'files/file_util_proxy.h', 'files/file_win.cc', @@ -206,6 +218,8 @@ 'files/memory_mapped_file.h', 'files/memory_mapped_file_posix.cc', 'files/memory_mapped_file_win.cc', + 'files/scoped_file.cc', + 'files/scoped_file.h', 'files/scoped_platform_file_closer.cc', 'files/scoped_platform_file_closer.h', 'files/scoped_temp_dir.cc', @@ -268,6 +282,8 @@ 'mac/mac_logging.cc', 'mac/mac_util.h', 'mac/mac_util.mm', + 'mac/mach_logging.cc', + 'mac/mach_logging.h', 'mac/objc_property_releaser.h', 'mac/objc_property_releaser.mm', 'mac/os_crash_dumps.cc', @@ -281,6 +297,8 @@ 'mac/scoped_launch_data.h', 'mac/scoped_mach_port.cc', 'mac/scoped_mach_port.h', + 'mac/scoped_mach_vm.cc', + 'mac/scoped_mach_vm.h', 'mac/scoped_nsautorelease_pool.h', 'mac/scoped_nsautorelease_pool.mm', 'mac/scoped_nsexception_enabler.h', @@ -288,20 +306,25 @@ 'mac/scoped_nsobject.h', 'mac/scoped_sending_event.h', 'mac/scoped_sending_event.mm', + 'mac/scoped_typeref.h', 'mac/sdk_forward_declarations.h', + 'mac/sdk_forward_declarations.mm', + 'macros.h', + 'md5.cc', + 'md5.h', 'memory/aligned_memory.cc', 'memory/aligned_memory.h', + 'memory/discardable_memory.cc', 'memory/discardable_memory.h', - 'memory/discardable_memory_allocator_android.cc', - 'memory/discardable_memory_allocator_android.h', 'memory/discardable_memory_android.cc', - 'memory/discardable_memory_android.h', 'memory/discardable_memory_emulated.cc', 'memory/discardable_memory_emulated.h', 'memory/discardable_memory_linux.cc', 'memory/discardable_memory_mac.cc', - 'memory/discardable_memory_provider.cc', - 'memory/discardable_memory_provider.h', + 'memory/discardable_memory_malloc.cc', + 'memory/discardable_memory_malloc.h', + 'memory/discardable_memory_manager.cc', + 'memory/discardable_memory_manager.h', 'memory/discardable_memory_win.cc', 'memory/linked_ptr.h', 'memory/manual_constructor.h', @@ -313,7 +336,6 @@ 'memory/ref_counted_delete_on_message_loop.h', 'memory/ref_counted_memory.cc', 'memory/ref_counted_memory.h', - 'memory/scoped_handle.h', 'memory/scoped_open_process.h', 'memory/scoped_policy.h', 'memory/scoped_ptr.h', @@ -341,10 +363,9 @@ 'message_loop/message_pump_android.h', 'message_loop/message_pump_default.cc', 'message_loop/message_pump_default.h', - 'message_loop/message_pump_ozone.cc', - 'message_loop/message_pump_ozone.h', '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', @@ -370,6 +391,9 @@ '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_mac.mm', @@ -428,6 +452,7 @@ 'process/launch_posix.cc', 'process/launch_win.cc', 'process/memory.h', + 'process/memory.cc', 'process/memory_linux.cc', 'process/memory_mac.mm', 'process/memory_win.cc', @@ -474,9 +499,13 @@ 'rand_util_win.cc', 'run_loop.cc', 'run_loop.h', - 'safe_numerics.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', 'scoped_native_library.cc', 'scoped_native_library.h', 'sequence_checker.h', @@ -557,6 +586,8 @@ 'sys_info_openbsd.cc', 'sys_info_posix.cc', 'sys_info_win.cc', + 'task/cancelable_task_tracker.cc', + 'task/cancelable_task_tracker.h', 'task_runner.cc', 'task_runner.h', 'task_runner_util.h', @@ -588,7 +619,9 @@ 'threading/thread_id_name_manager.cc', 'threading/thread_id_name_manager.h', 'threading/thread_local.h', + 'threading/thread_local_android.cc', 'threading/thread_local_posix.cc', + 'threading/thread_local_storage.cc', 'threading/thread_local_storage.h', 'threading/thread_local_storage_posix.cc', 'threading/thread_local_storage_win.cc', @@ -620,6 +653,8 @@ 'timer/hi_res_timer_manager.h', 'timer/hi_res_timer_manager_posix.cc', 'timer/hi_res_timer_manager_win.cc', + 'timer/mock_timer.cc', + 'timer/mock_timer.h', 'timer/timer.cc', 'timer/timer.h', 'tracked_objects.cc', @@ -678,31 +713,12 @@ 'win/shortcut.h', 'win/startup_information.cc', 'win/startup_information.h', - 'win/text_services_message_filter.cc', - 'win/text_services_message_filter.h', 'win/win_util.cc', 'win/win_util.h', 'win/windows_version.cc', 'win/windows_version.h', 'win/wrapped_window_proc.cc', 'win/wrapped_window_proc.h', - 'x11/x11_error_tracker.cc', - 'x11/x11_error_tracker.h', - 'x11/x11_error_tracker_gtk.cc', - ], - 'conditions': [ - ['use_aura==1 and use_x11==1', { - 'sources': [ - 'x11/edid_parser_x11.cc', - 'x11/edid_parser_x11.h', - ], - }], - ['google_tv==1', { - 'sources': [ - 'android/context_types.cc', - 'android/context_types.h', - ], - }], ], 'defines': [ 'BASE_IMPLEMENTATION', @@ -727,14 +743,6 @@ 'message_loop/message_pump_glib.cc', ], }], - ['<(use_x11)==0 or >(nacl_untrusted_build)==1', { - 'sources!': [ - 'message_loop/message_pump_x11.cc', - ], - }], - ['<(toolkit_uses_gtk)==0 or >(nacl_untrusted_build)==1', { - 'sources!': ['message_loop/message_pump_gtk.cc'], - }], ['(OS != "linux" and <(os_bsd) != 1 and OS != "android") or >(nacl_untrusted_build)==1', { 'sources!': [ # Not automatically excluded by the *linux.cc rules. @@ -752,7 +760,11 @@ 'file_util.cc', 'file_util_posix.cc', 'files/file_enumerator_posix.cc', + 'files/file_path_watcher_fsevents.cc', + 'files/file_path_watcher_fsevents.h', 'files/file_path_watcher_kqueue.cc', + 'files/file_path_watcher_kqueue.h', + 'files/file_proxy.cc', 'files/file_util_proxy.cc', 'memory/shared_memory_posix.cc', 'native_library_posix.cc', @@ -769,15 +781,24 @@ 'third_party/dynamic_annotations/dynamic_annotations.c', ], 'sources/': [ - # Metrics won't work in the NaCl sandbox. - ['exclude', '^metrics/'], ['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', + 'files/file_path_watcher_fsevents.cc', + 'files/file_path_watcher_fsevents.h', 'files/file_path_watcher_kqueue.cc', + 'files/file_path_watcher_kqueue.h', 'files/file_path_watcher_stub.cc', 'power_monitor/power_monitor_device_source_posix.cc', ], @@ -797,8 +818,12 @@ ], }], ['OS == "android" and _toolset == "host" and host_os == "linux"', { + 'defines': [ + 'OS_ANDROID_HOST=Linux', + ], 'sources/': [ # Pull in specific files for host builds. + ['include', '^atomicops_internals_x86_gcc\\.cc$'], ['include', '^threading/platform_thread_linux\\.cc$'], ], }], @@ -820,8 +845,10 @@ ['include', '^mac/bundle_locations\\.'], ['include', '^mac/foundation_util\\.'], ['include', '^mac/mac_logging\\.'], + ['include', '^mac/mach_logging\\.'], ['include', '^mac/objc_property_releaser\\.'], ['include', '^mac/scoped_mach_port\\.'], + ['include', '^mac/scoped_mach_vm\\.'], ['include', '^mac/scoped_nsautorelease_pool\\.'], ['include', '^mac/scoped_nsobject\\.'], ['include', '^memory/discardable_memory_mac\\.'], @@ -836,6 +863,9 @@ ['include', '^process/.*_ios\.(cc|mm)$'], ['include', '^process/memory_stubs\.cc$'], ['include', '^process/process_handle_posix\.cc$'], + ['exclude', 'files/file_path_watcher_fsevents.cc'], + ['exclude', 'files/file_path_watcher_fsevents.h'], + ['include', 'files/file_path_watcher_mac.cc'], ], 'sources': [ 'process/memory_stubs.cc', @@ -851,13 +881,11 @@ ['include', '(^|/)(cocoa|mac)/'], ['exclude', '_ios(_unittest)?\\.(h|cc|mm?)$'], ['exclude', '(^|/)ios/'], + ['exclude', 'files/file_path_watcher_fsevents.cc'], + ['exclude', 'files/file_path_watcher_fsevents.h'], + ['include', 'files/file_path_watcher_mac.cc'], ] }], - ['OS != "mac" or >(nacl_untrusted_build)==1', { - 'sources!': [ - 'mac/scoped_aedesc.h' - ], - }], # For now, just test the *BSD platforms enough to exclude them. # Subsequent changes will include them further. ['OS != "freebsd" or >(nacl_untrusted_build)==1', { @@ -868,21 +896,16 @@ 'sources/': [ ['exclude', '_openbsd\\.cc$'] ], }, ], - ['OS != "win" or >(nacl_untrusted_build)==1', { - 'sources/': [ ['exclude', '^win/'] ], - }, - ], - ['OS != "android" or >(nacl_untrusted_build)==1', { - 'sources/': [ ['exclude', '^android/'] ], - }, - ], ['OS == "win" and >(nacl_untrusted_build)==0', { 'include_dirs': [ '<(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', + 'files/file_path_watcher_kqueue.h', 'files/file_path_watcher_stub.cc', 'message_loop/message_pump_libevent.cc', 'posix/file_descriptor_shuffle.cc', @@ -895,12 +918,14 @@ ['<(use_ozone) == 1', { 'sources!': [ 'message_loop/message_pump_glib.cc', - 'message_loop/message_pump_x11.cc', ] }], ['OS == "linux" and >(nacl_untrusted_build)==0', { 'sources!': [ + 'files/file_path_watcher_fsevents.cc', + 'files/file_path_watcher_fsevents.h', 'files/file_path_watcher_kqueue.cc', + 'files/file_path_watcher_kqueue.h', 'files/file_path_watcher_stub.cc', ], }], @@ -924,28 +949,55 @@ ['exclude', '^sys_info_linux\\.cc$'], ], }], - ['<(chromeos)!=1 or >(nacl_untrusted_build)==1', { - 'sources/': [ - ['exclude', '^chromeos/'], - ], - }], # Remove all unnecessary files for build_nexe.py to avoid exceeding # command-line-string limitation when building NaCl on Windows. ['OS == "win" and >(nacl_untrusted_build)==1', { 'sources/': [ ['exclude', '\\.h$'] ], }], - ['<(use_system_nspr)==1 and >(nacl_untrusted_build)==0', { - 'sources/': [ - ['exclude', '^third_party/nspr/'], - ], - }], - ['<(toolkit_uses_gtk) == 1', { - 'sources!': [ - 'x11/x11_error_tracker.cc', - ], - }], ], }], + ['base_i18n_target==1', { + 'defines': [ + 'BASE_I18N_IMPLEMENTATION', + ], + 'sources': [ + 'i18n/base_i18n_export.h', + 'i18n/bidi_line_iterator.cc', + 'i18n/bidi_line_iterator.h', + 'i18n/break_iterator.cc', + 'i18n/break_iterator.h', + 'i18n/case_conversion.cc', + 'i18n/case_conversion.h', + 'i18n/char_iterator.cc', + 'i18n/char_iterator.h', + 'i18n/file_util_icu.cc', + 'i18n/file_util_icu.h', + 'i18n/i18n_constants.cc', + 'i18n/i18n_constants.h', + 'i18n/icu_encoding_detection.cc', + 'i18n/icu_encoding_detection.h', + 'i18n/icu_string_conversions.cc', + 'i18n/icu_string_conversions.h', + 'i18n/icu_util.cc', + 'i18n/icu_util.h', + 'i18n/number_formatting.cc', + 'i18n/number_formatting.h', + 'i18n/rtl.cc', + 'i18n/rtl.h', + 'i18n/streaming_utf8_validator.cc', + 'i18n/streaming_utf8_validator.h', + 'i18n/string_compare.cc', + 'i18n/string_compare.h', + 'i18n/string_search.cc', + 'i18n/string_search.h', + 'i18n/time_formatting.cc', + 'i18n/time_formatting.h', + 'i18n/timezone.cc', + 'i18n/timezone.h', + 'i18n/utf8_validator_tables.cc', + 'i18n/utf8_validator_tables.h', + ], + }] ], }, } |