diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2014-06-25 15:04:30 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2014-06-25 15:04:30 +0000 |
commit | 4c21d3a8817eb02f39b986c257f171da3166ecfc (patch) | |
tree | dac148172d6ee1d7359938e530741be884b1b1eb /system_wrappers | |
parent | b0cf5e180c1851aaa78ea6a20830e650970ab732 (diff) | |
parent | c34b9e5d5cd44c31c4f9da649b71d0d3132cf516 (diff) | |
download | webrtc-4c21d3a8817eb02f39b986c257f171da3166ecfc.tar.gz |
Merge third_party/webrtc from https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git at c34b9e5d5cd44c31c4f9da649b71d0d3132cf516
This commit was generated by merge_from_chromium.py.
Change-Id: Ibdea97e7e6e800b2b7d7d3122a1d77e467cfbde4
Diffstat (limited to 'system_wrappers')
-rw-r--r-- | system_wrappers/BUILD.gn | 213 | ||||
-rw-r--r-- | system_wrappers/OWNERS | 4 |
2 files changed, 216 insertions, 1 deletions
diff --git a/system_wrappers/BUILD.gn b/system_wrappers/BUILD.gn new file mode 100644 index 00000000..4c6c6051 --- /dev/null +++ b/system_wrappers/BUILD.gn @@ -0,0 +1,213 @@ +# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. +# +# Use of this source code is governed by a BSD-style license +# that can be found in the LICENSE file in the root of the source +# tree. An additional intellectual property rights grant can be found +# in the file PATENTS. All contributing project authors may +# be found in the AUTHORS file in the root of the source tree. + +import("../build/webrtc.gni") + +config("system_wrappers_inherited_config") { + include_dirs = [ + "interface", + ] +} + +static_library("system_wrappers") { + sources = [ + "interface/aligned_malloc.h", + "interface/atomic32.h", + "interface/clock.h", + "interface/compile_assert.h", + "interface/condition_variable_wrapper.h", + "interface/cpu_info.h", + "interface/cpu_features_wrapper.h", + "interface/critical_section_wrapper.h", + "interface/data_log.h", + "interface/data_log_c.h", + "interface/data_log_impl.h", + "interface/event_tracer.h", + "interface/event_wrapper.h", + "interface/field_trial.h", + "interface/file_wrapper.h", + "interface/fix_interlocked_exchange_pointer_win.h", + "interface/logging.h", + "interface/ref_count.h", + "interface/rtp_to_ntp.h", + "interface/rw_lock_wrapper.h", + "interface/scoped_ptr.h", + "interface/scoped_refptr.h", + "interface/scoped_vector.h", + "interface/sleep.h", + "interface/sort.h", + "interface/static_instance.h", + "interface/stl_util.h", + "interface/stringize_macros.h", + "interface/thread_annotations.h", + "interface/thread_wrapper.h", + "interface/tick_util.h", + "interface/timestamp_extrapolator.h", + "interface/trace.h", + "interface/trace_event.h", + "interface/utf_util_win.h", + "source/aligned_malloc.cc", + "source/atomic32_mac.cc", + "source/atomic32_win.cc", + "source/clock.cc", + "source/condition_variable.cc", + "source/condition_variable_posix.cc", + "source/condition_variable_posix.h", + "source/condition_variable_event_win.cc", + "source/condition_variable_event_win.h", + "source/condition_variable_native_win.cc", + "source/condition_variable_native_win.h", + "source/cpu_info.cc", + "source/cpu_features.cc", + "source/critical_section.cc", + "source/critical_section_posix.cc", + "source/critical_section_posix.h", + "source/critical_section_win.cc", + "source/critical_section_win.h", + "source/data_log_c.cc", + "source/event.cc", + "source/event_posix.cc", + "source/event_posix.h", + "source/event_tracer.cc", + "source/event_win.cc", + "source/event_win.h", + "source/file_impl.cc", + "source/file_impl.h", + "source/logging.cc", + "source/rtp_to_ntp.cc", + "source/rw_lock.cc", + "source/rw_lock_generic.cc", + "source/rw_lock_generic.h", + "source/rw_lock_posix.cc", + "source/rw_lock_posix.h", + "source/rw_lock_win.cc", + "source/rw_lock_win.h", + "source/set_thread_name_win.h", + "source/sleep.cc", + "source/sort.cc", + "source/tick_util.cc", + "source/thread.cc", + "source/thread_posix.cc", + "source/thread_posix.h", + "source/thread_win.cc", + "source/thread_win.h", + "source/timestamp_extrapolator.cc", + "source/trace_impl.cc", + "source/trace_impl.h", + "source/trace_posix.cc", + "source/trace_posix.h", + "source/trace_win.cc", + "source/trace_win.h", + ] + + configs += [ "..:common_config" ] + + direct_dependent_configs = [ + "..:common_inherited_config", + ":system_wrappers_inherited_config", + ] + + if (enable_data_logging) { + sources += [ "source/data_log.cc" ] + } else { + sources += [ "source/data_log_no_op.cc" ] + } + + defines = [] + libs = [] + + if (is_android) { + sources += [ + "interface/logcat_trace_context.h", + "source/logcat_trace_context.cc", + ] + + defines += [ + "WEBRTC_THREAD_RR", + # TODO(leozwang): Investigate CLOCK_REALTIME and CLOCK_MONOTONIC + # support on Android. Keep WEBRTC_CLOCK_TYPE_REALTIME for now, + # remove it after I verify that CLOCK_MONOTONIC is fully functional + # with condition and event functions in system_wrappers. + "WEBRTC_CLOCK_TYPE_REALTIME", + ] + + deps = [ "cpu_features_android" ] + + libs += [ "log" ] + } + + if (is_linux) { + defines += [ + "WEBRTC_THREAD_RR", + # TODO(andrew): can we select this automatically? + # Define this if the Linux system does not support CLOCK_MONOTONIC. + #"WEBRTC_CLOCK_TYPE_REALTIME", + ] + + libs += [ "rt" ] + } + + if (!is_mac && !is_ios) { + sources += [ + "source/atomic32_posix.cc", + ] + } + + if (is_ios || is_mac) { + defines += [ + "WEBRTC_THREAD_RR", + "WEBRTC_CLOCK_TYPE_REALTIME", + ] + } + + if (is_ios) { + sources += [ + "source/atomic32_mac.cc", + ] + } + + if (is_win) { + libs += [ "winmm.lib" ] + + cflags = [ + "/wd4267", # size_t to int truncation. + "/wd4334", # Ignore warning on shift operator promotion. + ] + } + + include_dirs = [ + "source/spreadsortlib", + ] + + deps = [ + "../base:webrtc_base", + ] +} + +source_set("field_trial_default") { + sources = [ + "source/field_trial_default.cc", + ] + deps = [ + ":system_wrappers", + ] +} + +if (is_android) { + source_set("cpu_features_android") { + sources = [ + "source/cpu_features_android.c", + ] + + if (is_android_webview_build) { + libs += [ "cpufeatures.a" ] + } else { + deps = [ "//third_party/android_tools:cpu_features" ] + } + } +} diff --git a/system_wrappers/OWNERS b/system_wrappers/OWNERS index 4091a93d..d292dfdb 100644 --- a/system_wrappers/OWNERS +++ b/system_wrappers/OWNERS @@ -4,4 +4,6 @@ perkj@webrtc.org henrika@webrtc.org henrikg@webrtc.org mflodman@webrtc.org -niklas.enbom@webrtc.org
\ No newline at end of file +niklas.enbom@webrtc.org + +per-file BUILD.gn=kjellander@webrtc.org |