diff options
58 files changed, 379 insertions, 373 deletions
diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp index 9d44b42d24..ee03bd0bd4 100755 --- a/talk/libjingle.gyp +++ b/talk/libjingle.gyp @@ -357,8 +357,8 @@ '<(webrtc_root)/webrtc.gyp:webrtc', '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine', '<(webrtc_root)/sound/sound.gyp:rtc_sound', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers_default', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', '<(webrtc_root)/libjingle/xmllite/xmllite.gyp:rtc_xmllite', '<(webrtc_root)/libjingle/xmpp/xmpp.gyp:rtc_xmpp', '<(webrtc_root)/p2p/p2p.gyp:rtc_p2p', diff --git a/webrtc/build/android/test_runner.py b/webrtc/build/android/test_runner.py index 0fcc13cc44..c5aa9a1ddc 100755 --- a/webrtc/build/android/test_runner.py +++ b/webrtc/build/android/test_runner.py @@ -59,7 +59,7 @@ def main(): 'modules_tests': 'webrtc/modules/modules_tests.isolate', 'modules_unittests': 'webrtc/modules/modules_unittests.isolate', 'system_wrappers_unittests': - 'webrtc/system_wrappers/source/system_wrappers_unittests.isolate', + 'webrtc/system_wrappers/system_wrappers_unittests.isolate', 'test_support_unittests': 'webrtc/test/test_support_unittests.isolate', 'tools_unittests': 'webrtc/tools/tools_unittests.isolate', 'video_capture_tests': diff --git a/webrtc/build/apk_tests.gyp b/webrtc/build/apk_tests.gyp index eed0799f2d..4c699fd0a1 100644 --- a/webrtc/build/apk_tests.gyp +++ b/webrtc/build/apk_tests.gyp @@ -96,7 +96,7 @@ 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)system_wrappers_unittests<(SHARED_LIB_SUFFIX)', }, 'dependencies': [ - '<(webrtc_root)/system_wrappers/source/system_wrappers_tests.gyp:system_wrappers_unittests', + '<(webrtc_root)/system_wrappers/system_wrappers_tests.gyp:system_wrappers_unittests', ], 'includes': [ '../../build/apk_test.gypi', diff --git a/webrtc/common_audio/common_audio.gyp b/webrtc/common_audio/common_audio.gyp index 76519c26cc..6b0a1a39ac 100644 --- a/webrtc/common_audio/common_audio.gyp +++ b/webrtc/common_audio/common_audio.gyp @@ -15,7 +15,7 @@ 'target_name': 'common_audio', 'type': 'static_library', 'dependencies': [ - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'include_dirs': [ 'resampler/include', diff --git a/webrtc/common_video/common_video.gyp b/webrtc/common_video/common_video.gyp index 97cb94197e..69e5eb3c9c 100644 --- a/webrtc/common_video/common_video.gyp +++ b/webrtc/common_video/common_video.gyp @@ -18,7 +18,7 @@ 'libyuv/include', ], 'dependencies': [ - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'direct_dependent_settings': { 'include_dirs': [ diff --git a/webrtc/common_video/common_video_unittests.gyp b/webrtc/common_video/common_video_unittests.gyp index 9189991ee4..2b896c6bb2 100644 --- a/webrtc/common_video/common_video_unittests.gyp +++ b/webrtc/common_video/common_video_unittests.gyp @@ -15,7 +15,7 @@ 'dependencies': [ '<(webrtc_root)/common_video/common_video.gyp:common_video', '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/test/test.gyp:test_support_main', ], 'sources': [ diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi b/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi index 2245b03c06..3a128ed7d9 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi @@ -13,7 +13,7 @@ 'type': 'static_library', 'dependencies': [ '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'include_dirs': [ '../interface', diff --git a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.gypi b/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.gypi index a9a5bb9438..e296634827 100644 --- a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.gypi +++ b/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.gypi @@ -16,7 +16,7 @@ 'iSACFix', 'webrtc_opus', '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/test/test.gyp:test_support_main', ], 'sources': [ diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi b/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi index 1ddad4533e..db7142f396 100644 --- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi +++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi @@ -18,7 +18,7 @@ 'PCM16B', 'red', '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'audio_coding_defines': [], 'conditions': [ @@ -160,8 +160,8 @@ 'audio_coding_module', '<(DEPTH)/testing/gtest.gyp:gtest', '<(webrtc_root)/test/test.gyp:test_support', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers_default', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', ], 'sources': [ @@ -178,8 +178,8 @@ 'audio_coding_module', '<(DEPTH)/testing/gtest.gyp:gtest', '<(webrtc_root)/test/test.gyp:test_support', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers_default', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', ], 'sources': [ diff --git a/webrtc/modules/audio_coding/main/test/RTPFile.cc b/webrtc/modules/audio_coding/main/test/RTPFile.cc index 6f0c74ef45..e403020194 100644 --- a/webrtc/modules/audio_coding/main/test/RTPFile.cc +++ b/webrtc/modules/audio_coding/main/test/RTPFile.cc @@ -21,7 +21,7 @@ #include "audio_coding_module.h" #include "engine_configurations.h" -#include "rw_lock_wrapper.h" +#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" // TODO(tlegrand): Consider removing usage of gtest. #include "testing/gtest/include/gtest/gtest.h" diff --git a/webrtc/modules/audio_coding/main/test/SpatialAudio.cc b/webrtc/modules/audio_coding/main/test/SpatialAudio.cc index b82378b8ec..7286fc172f 100644 --- a/webrtc/modules/audio_coding/main/test/SpatialAudio.cc +++ b/webrtc/modules/audio_coding/main/test/SpatialAudio.cc @@ -13,10 +13,10 @@ #include <math.h> -#include "common_types.h" -#include "SpatialAudio.h" -#include "trace.h" -#include "utility.h" +#include "webrtc/common_types.h" +#include "webrtc/modules/audio_coding/main/test/SpatialAudio.h" +#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/interface/trace.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/neteq.gypi b/webrtc/modules/audio_coding/neteq/neteq.gypi index 98b16838ed..5e3f250e61 100644 --- a/webrtc/modules/audio_coding/neteq/neteq.gypi +++ b/webrtc/modules/audio_coding/neteq/neteq.gypi @@ -28,7 +28,7 @@ '<@(codecs)', '<(DEPTH)/third_party/opus/opus.gyp:opus', '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', 'audio_decoder_interface', ], }, diff --git a/webrtc/modules/audio_coding/neteq/neteq_tests.gypi b/webrtc/modules/audio_coding/neteq/neteq_tests.gypi index ed0cd4bdfc..3a0ebdbd46 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_tests.gypi +++ b/webrtc/modules/audio_coding/neteq/neteq_tests.gypi @@ -87,7 +87,7 @@ 'neteq_unittest_tools', '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers_default', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', ], 'sources': [ 'tools/rtp_analyze.cc', @@ -135,7 +135,7 @@ 'type': 'executable', 'dependencies': [ 'neteq_test_tools', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'sources': [ 'test/rtp_to_text.cc', diff --git a/webrtc/modules/audio_coding/neteq/test/rtp_to_text.cc b/webrtc/modules/audio_coding/neteq/test/rtp_to_text.cc index 1112d79c87..aa3f28f361 100644 --- a/webrtc/modules/audio_coding/neteq/test/rtp_to_text.cc +++ b/webrtc/modules/audio_coding/neteq/test/rtp_to_text.cc @@ -17,7 +17,7 @@ * */ -#include "data_log.h" +#include "webrtc/system_wrappers/interface/data_log.h" #include "NETEQTEST_DummyRTPpacket.h" #include "NETEQTEST_RTPpacket.h" diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer.gypi b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer.gypi index 653a7cca85..83d9a80f15 100644 --- a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer.gypi +++ b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer.gypi @@ -14,7 +14,7 @@ 'dependencies': [ 'audio_processing', 'webrtc_utility', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'include_dirs': [ '../interface', diff --git a/webrtc/modules/audio_device/audio_device.gypi b/webrtc/modules/audio_device/audio_device.gypi index add3be2a09..76eb38a4a3 100644 --- a/webrtc/modules/audio_device/audio_device.gypi +++ b/webrtc/modules/audio_device/audio_device.gypi @@ -14,7 +14,7 @@ 'dependencies': [ 'webrtc_utility', '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'include_dirs': [ '.', @@ -223,7 +223,7 @@ 'webrtc_utility', '<(webrtc_root)/test/test.gyp:test_support_main', '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'sources': [ 'test/audio_device_test_api.cc', @@ -237,7 +237,7 @@ 'audio_device', 'webrtc_utility', '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/test/test.gyp:test_support', '<(DEPTH)/testing/gtest.gyp:gtest', ], @@ -277,7 +277,7 @@ 'webrtc_utility', '<(DEPTH)/testing/gmock.gyp:gmock', '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/test/test.gyp:test_support_main', ], 'sources': [ diff --git a/webrtc/modules/audio_processing/audio_processing.gypi b/webrtc/modules/audio_processing/audio_processing.gypi index af6a7ed4a2..664fb2db0f 100644 --- a/webrtc/modules/audio_processing/audio_processing.gypi +++ b/webrtc/modules/audio_processing/audio_processing.gypi @@ -28,7 +28,7 @@ '<(webrtc_root)/base/base.gyp:rtc_base_approved', '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', '<(webrtc_root)/modules/modules.gyp:iSAC', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'sources': [ 'aec/aec_core.c', diff --git a/webrtc/modules/audio_processing/audio_processing_tests.gypi b/webrtc/modules/audio_processing/audio_processing_tests.gypi index 0a3393b560..73aed58e75 100644 --- a/webrtc/modules/audio_processing/audio_processing_tests.gypi +++ b/webrtc/modules/audio_processing/audio_processing_tests.gypi @@ -30,7 +30,7 @@ 'audio_processing', 'audioproc_debug_proto', '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/test/test.gyp:test_support', ], 'sources': [ 'test/process_test.cc', ], @@ -50,7 +50,7 @@ 'type': 'executable', 'dependencies': [ 'audioproc_debug_proto', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', ], diff --git a/webrtc/modules/bitrate_controller/bitrate_controller.gypi b/webrtc/modules/bitrate_controller/bitrate_controller.gypi index 71dbc1f415..614d4dcc7a 100644 --- a/webrtc/modules/bitrate_controller/bitrate_controller.gypi +++ b/webrtc/modules/bitrate_controller/bitrate_controller.gypi @@ -12,7 +12,7 @@ 'target_name': 'bitrate_controller', 'type': 'static_library', 'dependencies': [ - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'sources': [ 'bitrate_controller_impl.cc', diff --git a/webrtc/modules/desktop_capture/desktop_capture.gypi b/webrtc/modules/desktop_capture/desktop_capture.gypi index 49f9347ad7..15393761f8 100644 --- a/webrtc/modules/desktop_capture/desktop_capture.gypi +++ b/webrtc/modules/desktop_capture/desktop_capture.gypi @@ -12,7 +12,7 @@ 'target_name': 'desktop_capture', 'type': 'static_library', 'dependencies': [ - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/base/base.gyp:rtc_base', ], 'sources': [ diff --git a/webrtc/modules/media_file/source/media_file.gypi b/webrtc/modules/media_file/source/media_file.gypi index 37df13c5ac..bce7db60be 100644 --- a/webrtc/modules/media_file/source/media_file.gypi +++ b/webrtc/modules/media_file/source/media_file.gypi @@ -12,7 +12,7 @@ 'target_name': 'media_file', 'type': 'static_library', 'dependencies': [ - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'include_dirs': [ '../interface', diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp index 3c610511a8..dea0f4e91d 100644 --- a/webrtc/modules/modules.gyp +++ b/webrtc/modules/modules.gyp @@ -98,7 +98,7 @@ '<(webrtc_root)/modules/remote_bitrate_estimator/remote_bitrate_estimator_components.gyp:rbe_components', '<(webrtc_root)/modules/video_coding/codecs/vp8/vp8.gyp:webrtc_vp8', '<(webrtc_root)/modules/video_coding/codecs/vp9/vp9.gyp:webrtc_vp9', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/test/test.gyp:frame_generator', '<(webrtc_root)/test/test.gyp:rtp_test_utils', '<(webrtc_root)/test/test.gyp:test_support_main', @@ -361,7 +361,7 @@ '<(webrtc_root)/common_video/common_video.gyp:common_video', '<(webrtc_root)/modules/video_coding/codecs/vp8/vp8.gyp:webrtc_vp8', '<(webrtc_root)/modules/video_coding/codecs/vp9/vp9.gyp:webrtc_vp9', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/test/metrics.gyp:metrics', '<(webrtc_root)/test/test.gyp:test_support', '<(webrtc_root)/test/test.gyp:test_support_main', diff --git a/webrtc/modules/pacing/pacing.gypi b/webrtc/modules/pacing/pacing.gypi index 366845089f..4aaa0aa32c 100644 --- a/webrtc/modules/pacing/pacing.gypi +++ b/webrtc/modules/pacing/pacing.gypi @@ -12,7 +12,7 @@ 'target_name': 'paced_sender', 'type': 'static_library', 'dependencies': [ - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'sources': [ 'include/paced_sender.h', diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi index 4636eca643..53b4cd30ac 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi @@ -16,7 +16,7 @@ 'type': 'static_library', 'dependencies': [ '<(webrtc_root)/modules/remote_bitrate_estimator/remote_bitrate_estimator_components.gyp:rbe_components', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'sources': [ 'include/bwe_defines.h', @@ -29,7 +29,7 @@ 'target_name': 'bwe_tools_util', 'type': 'static_library', 'dependencies': [ - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', 'rtp_rtcp', ], 'sources': [ @@ -44,8 +44,8 @@ '../rtp_rtcp/source/rtp_rtcp.gypi', ], 'dependencies': [ - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers_default', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', 'bwe_tools_util', 'rtp_rtcp', ], @@ -67,8 +67,8 @@ '../rtp_rtcp/source/rtp_rtcp.gypi', ], 'dependencies': [ - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers_default', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', 'bwe_tools_util', 'rtp_rtcp', ], diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp.gypi b/webrtc/modules/rtp_rtcp/source/rtp_rtcp.gypi index a6d211549c..65f33e83d2 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp.gypi +++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp.gypi @@ -12,7 +12,7 @@ 'target_name': 'rtp_rtcp', 'type': 'static_library', 'dependencies': [ - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/modules/modules.gyp:paced_sender', '<(webrtc_root)/modules/modules.gyp:remote_bitrate_estimator', ], diff --git a/webrtc/modules/rtp_rtcp/test/bwe_standalone.gypi b/webrtc/modules/rtp_rtcp/test/bwe_standalone.gypi index 25d72642c1..e45daec77d 100644 --- a/webrtc/modules/rtp_rtcp/test/bwe_standalone.gypi +++ b/webrtc/modules/rtp_rtcp/test/bwe_standalone.gypi @@ -15,7 +15,7 @@ 'matlab_plotting', 'rtp_rtcp', 'udp_transport', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'sources': [ 'BWEStandAlone/BWEStandAlone.cc', @@ -39,7 +39,7 @@ 'type': 'static_library', 'dependencies': [ 'matlab_plotting_include', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'include_dirs': [ '/opt/matlab2010a/extern/include', diff --git a/webrtc/modules/utility/source/file_player_impl.cc b/webrtc/modules/utility/source/file_player_impl.cc index 29f70426de..5d935fbdf5 100644 --- a/webrtc/modules/utility/source/file_player_impl.cc +++ b/webrtc/modules/utility/source/file_player_impl.cc @@ -12,9 +12,9 @@ #include "webrtc/system_wrappers/interface/logging.h" #ifdef WEBRTC_MODULE_UTILITY_VIDEO - #include "frame_scaler.h" - #include "tick_util.h" - #include "video_coder.h" + #include "webrtc/modules/utility/source/frame_scaler.h" + #include "webrtc/modules/utility/source/video_coder.h" + #include "webrtc/system_wrappers/interface/tick_util.h" #endif namespace webrtc { diff --git a/webrtc/modules/utility/source/file_recorder_impl.cc b/webrtc/modules/utility/source/file_recorder_impl.cc index 14c5288bb0..e857afeeec 100644 --- a/webrtc/modules/utility/source/file_recorder_impl.cc +++ b/webrtc/modules/utility/source/file_recorder_impl.cc @@ -15,10 +15,10 @@ #include "webrtc/system_wrappers/interface/logging.h" #ifdef WEBRTC_MODULE_UTILITY_VIDEO - #include "critical_section_wrapper.h" - #include "frame_scaler.h" - #include "video_coder.h" - #include "video_frames_queue.h" + #include "webrtc/modules/utility/source/frame_scaler.h" + #include "webrtc/modules/utility/source/video_coder.h" + #include "webrtc/modules/utility/source/video_frames_queue.h" + #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #endif namespace webrtc { diff --git a/webrtc/modules/utility/source/file_recorder_impl.h b/webrtc/modules/utility/source/file_recorder_impl.h index 9e17fd60ec..5593827019 100644 --- a/webrtc/modules/utility/source/file_recorder_impl.h +++ b/webrtc/modules/utility/source/file_recorder_impl.h @@ -31,9 +31,9 @@ #include "webrtc/typedefs.h" #ifdef WEBRTC_MODULE_UTILITY_VIDEO - #include "frame_scaler.h" - #include "video_coder.h" - #include "video_frames_queue.h" + #include "webrtc/modules/utility/source/frame_scaler.h" + #include "webrtc/modules/utility/source/video_coder.h" + #include "webrtc/modules/utility/source/video_frames_queue.h" #endif namespace webrtc { diff --git a/webrtc/modules/utility/source/utility.gypi b/webrtc/modules/utility/source/utility.gypi index 2f09657da8..c6e50463c3 100644 --- a/webrtc/modules/utility/source/utility.gypi +++ b/webrtc/modules/utility/source/utility.gypi @@ -15,7 +15,7 @@ 'audio_coding_module', 'media_file', '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'sources': [ '../interface/audio_frame_operations.h', diff --git a/webrtc/modules/video_capture/video_capture.gypi b/webrtc/modules/video_capture/video_capture.gypi index 22b8e02c4a..771c147b60 100644 --- a/webrtc/modules/video_capture/video_capture.gypi +++ b/webrtc/modules/video_capture/video_capture.gypi @@ -18,7 +18,7 @@ 'dependencies': [ 'webrtc_utility', '<(webrtc_root)/common_video/common_video.gyp:common_video', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'sources': [ 'device_info_impl.cc', @@ -163,7 +163,7 @@ 'video_capture_module', 'video_capture_module_internal_impl', 'webrtc_utility', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', '<(DEPTH)/testing/gtest.gyp:gtest', ], 'sources': [ diff --git a/webrtc/modules/video_coding/codecs/i420/main/source/i420.gypi b/webrtc/modules/video_coding/codecs/i420/main/source/i420.gypi index dc2adcef15..3718e8924d 100644 --- a/webrtc/modules/video_coding/codecs/i420/main/source/i420.gypi +++ b/webrtc/modules/video_coding/codecs/i420/main/source/i420.gypi @@ -12,7 +12,7 @@ 'target_name': 'webrtc_i420', 'type': 'static_library', 'dependencies': [ - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'sources': [ '../interface/i420.h', diff --git a/webrtc/modules/video_coding/codecs/tools/video_codecs_tools.gypi b/webrtc/modules/video_coding/codecs/tools/video_codecs_tools.gypi index 3e77a5be11..f7ad56e620 100644 --- a/webrtc/modules/video_coding/codecs/tools/video_codecs_tools.gypi +++ b/webrtc/modules/video_coding/codecs/tools/video_codecs_tools.gypi @@ -17,7 +17,7 @@ 'video_codecs_test_framework', 'webrtc_video_coding', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers_default', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', '<(webrtc_root)/test/metrics.gyp:metrics', '<(webrtc_vp8_dir)/vp8.gyp:webrtc_vp8', ], diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8.gyp b/webrtc/modules/video_coding/codecs/vp8/vp8.gyp index a86b401042..504d4b844f 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8.gyp +++ b/webrtc/modules/video_coding/codecs/vp8/vp8.gyp @@ -17,7 +17,7 @@ 'dependencies': [ '<(webrtc_root)/common_video/common_video.gyp:common_video', '<(webrtc_root)/modules/video_coding/utility/video_coding_utility.gyp:video_coding_utility', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'conditions': [ ['build_libvpx==1', { @@ -64,7 +64,7 @@ '<(webrtc_root)/common_video/common_video.gyp:common_video', '<(webrtc_root)/test/metrics.gyp:metrics', '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/test/test.gyp:test_support_main', '<(webrtc_root)/tools/internal_tools.gyp:command_line_parser', ], diff --git a/webrtc/modules/video_coding/codecs/vp9/vp9.gyp b/webrtc/modules/video_coding/codecs/vp9/vp9.gyp index 2bd46feb89..c4c93c9e13 100644 --- a/webrtc/modules/video_coding/codecs/vp9/vp9.gyp +++ b/webrtc/modules/video_coding/codecs/vp9/vp9.gyp @@ -17,7 +17,7 @@ 'dependencies': [ '<(webrtc_root)/common_video/common_video.gyp:common_video', '<(webrtc_root)/modules/video_coding/utility/video_coding_utility.gyp:video_coding_utility', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'conditions': [ ['build_libvpx==1', { diff --git a/webrtc/modules/video_coding/main/source/video_coding.gypi b/webrtc/modules/video_coding/main/source/video_coding.gypi index 02c5a5c06d..4793a138ea 100644 --- a/webrtc/modules/video_coding/main/source/video_coding.gypi +++ b/webrtc/modules/video_coding/main/source/video_coding.gypi @@ -15,7 +15,7 @@ 'webrtc_i420', '<(webrtc_root)/common_video/common_video.gyp:common_video', '<(webrtc_root)/modules/video_coding/utility/video_coding_utility.gyp:video_coding_utility', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', '<(webrtc_vp8_dir)/vp8.gyp:webrtc_vp8', '<(webrtc_vp9_dir)/vp9.gyp:webrtc_vp9', ], diff --git a/webrtc/modules/video_coding/main/source/video_coding_test.gypi b/webrtc/modules/video_coding/main/source/video_coding_test.gypi index 628d9d5ce1..81fd4e3c8d 100644 --- a/webrtc/modules/video_coding/main/source/video_coding_test.gypi +++ b/webrtc/modules/video_coding/main/source/video_coding_test.gypi @@ -20,7 +20,7 @@ '<(webrtc_root)/test/test.gyp:test_support', '<(webrtc_root)/test/metrics.gyp:metrics', '<(webrtc_root)/common_video/common_video.gyp:common_video', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers_default', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', '<(webrtc_root)/test/webrtc_test_common.gyp:webrtc_test_common', ], 'sources': [ diff --git a/webrtc/modules/video_coding/utility/video_coding_utility.gyp b/webrtc/modules/video_coding/utility/video_coding_utility.gyp index dc2b33f227..eccc4da563 100644 --- a/webrtc/modules/video_coding/utility/video_coding_utility.gyp +++ b/webrtc/modules/video_coding/utility/video_coding_utility.gyp @@ -15,7 +15,7 @@ 'target_name': 'video_coding_utility', 'type': 'static_library', 'dependencies': [ - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'sources': [ 'frame_dropper.cc', diff --git a/webrtc/modules/video_processing/main/source/video_processing.gypi b/webrtc/modules/video_processing/main/source/video_processing.gypi index f62aa18ada..0126519bc0 100644 --- a/webrtc/modules/video_processing/main/source/video_processing.gypi +++ b/webrtc/modules/video_processing/main/source/video_processing.gypi @@ -15,7 +15,7 @@ 'webrtc_utility', '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', '<(webrtc_root)/common_video/common_video.gyp:common_video', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'sources': [ '../interface/video_processing.h', diff --git a/webrtc/modules/video_render/video_render.gypi b/webrtc/modules/video_render/video_render.gypi index 38a7798560..3540b6a01f 100644 --- a/webrtc/modules/video_render/video_render.gypi +++ b/webrtc/modules/video_render/video_render.gypi @@ -18,7 +18,7 @@ 'dependencies': [ 'webrtc_utility', '<(webrtc_root)/common_video/common_video.gyp:common_video', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'sources': [ 'external/video_render_external_impl.cc', @@ -159,7 +159,7 @@ 'dependencies': [ 'video_render_module_internal_impl', 'webrtc_utility', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/common_video/common_video.gyp:common_video', ], 'sources': [ diff --git a/webrtc/system_wrappers/BUILD.gn b/webrtc/system_wrappers/BUILD.gn index 630b3dbd9d..c4f1da5ef1 100644 --- a/webrtc/system_wrappers/BUILD.gn +++ b/webrtc/system_wrappers/BUILD.gn @@ -9,12 +9,6 @@ import("//build/config/android/config.gni") import("../build/webrtc.gni") -config("system_wrappers_inherited_config") { - include_dirs = [ - "interface", - ] -} - static_library("system_wrappers") { sources = [ "interface/aligned_array.h", @@ -116,7 +110,6 @@ static_library("system_wrappers") { public_configs = [ "..:common_inherited_config", - ":system_wrappers_inherited_config", ] if (rtc_enable_data_logging) { @@ -188,10 +181,6 @@ static_library("system_wrappers") { ] } - include_dirs = [ - "source/spreadsortlib", - ] - deps += [ "../base:rtc_base_approved", ] diff --git a/webrtc/system_wrappers/interface/field_trial.h b/webrtc/system_wrappers/interface/field_trial.h index f2cf880276..2f116adec0 100644 --- a/webrtc/system_wrappers/interface/field_trial.h +++ b/webrtc/system_wrappers/interface/field_trial.h @@ -24,7 +24,7 @@ // // Or link with a default one provided in: // -// system_wrappers/source/system_wrappers.gyp:field_trial_default +// system_wrappers/system_wrappers.gyp:field_trial_default // // // They are designed to wire up directly to chrome field trials and to speed up diff --git a/webrtc/system_wrappers/interface/metrics.h b/webrtc/system_wrappers/interface/metrics.h index 1b9426eb24..cb641c0674 100644 --- a/webrtc/system_wrappers/interface/metrics.h +++ b/webrtc/system_wrappers/interface/metrics.h @@ -41,7 +41,7 @@ // Histogram* histogram_pointer, const std::string& name, int sample); // // - or link with the default implementations (i.e. -// system_wrappers/source/system_wrappers.gyp:metrics_default). +// system_wrappers/system_wrappers.gyp:metrics_default). // // // Example usage: diff --git a/webrtc/system_wrappers/source/system_wrappers.gyp b/webrtc/system_wrappers/source/system_wrappers.gyp index 76df42b62e..a900731266 100644 --- a/webrtc/system_wrappers/source/system_wrappers.gyp +++ b/webrtc/system_wrappers/source/system_wrappers.gyp @@ -5,246 +5,10 @@ # 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. - +# +# TODO(andresp): Remove this file once chromium is referencing +# webrtc/system_wrappers/system_wrappers.gyp directly. { - 'includes': [ '../../build/common.gypi', ], - 'targets': [ - { - 'target_name': 'system_wrappers', - 'type': 'static_library', - 'include_dirs': [ - 'spreadsortlib', - '../interface', - ], - 'dependencies': [ - '../../base/base.gyp:rtc_base_approved', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../interface', - ], - }, - 'sources': [ - '../interface/aligned_array.h', - '../interface/aligned_malloc.h', - '../interface/atomic32.h', - '../interface/clock.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/logcat_trace_context.h', - '../interface/logging.h', - '../interface/metrics.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_wrapper.h', - '../interface/tick_util.h', - '../interface/timestamp_extrapolator.h', - '../interface/trace.h', - '../interface/trace_event.h', - '../interface/utf_util_win.h', - 'aligned_malloc.cc', - 'atomic32_mac.cc', - 'atomic32_posix.cc', - 'atomic32_win.cc', - 'clock.cc', - 'condition_variable.cc', - 'condition_variable_posix.cc', - 'condition_variable_posix.h', - 'condition_variable_event_win.cc', - 'condition_variable_event_win.h', - 'condition_variable_native_win.cc', - 'condition_variable_native_win.h', - 'cpu_info.cc', - 'cpu_features.cc', - 'critical_section.cc', - 'critical_section_posix.cc', - 'critical_section_posix.h', - 'critical_section_win.cc', - 'critical_section_win.h', - 'data_log.cc', - 'data_log_c.cc', - 'data_log_no_op.cc', - 'event.cc', - 'event_posix.cc', - 'event_posix.h', - 'event_tracer.cc', - 'event_win.cc', - 'event_win.h', - 'file_impl.cc', - 'file_impl.h', - 'logcat_trace_context.cc', - 'logging.cc', - 'rtp_to_ntp.cc', - 'rw_lock.cc', - 'rw_lock_generic.cc', - 'rw_lock_generic.h', - 'rw_lock_posix.cc', - 'rw_lock_posix.h', - 'rw_lock_win.cc', - 'rw_lock_win.h', - 'set_thread_name_win.h', - 'sleep.cc', - 'sort.cc', - 'tick_util.cc', - 'thread.cc', - 'thread_posix.cc', - 'thread_posix.h', - 'thread_win.cc', - 'thread_win.h', - 'timestamp_extrapolator.cc', - 'trace_impl.cc', - 'trace_impl.h', - 'trace_posix.cc', - 'trace_posix.h', - 'trace_win.cc', - 'trace_win.h', - ], - 'conditions': [ - ['enable_data_logging==1', { - 'sources!': [ 'data_log_no_op.cc', ], - }, { - 'sources!': [ 'data_log.cc', ], - },], - ['OS=="android"', { - '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', - ], - 'dependencies': [ 'cpu_features_android', ], - 'link_settings': { - 'libraries': [ - '-llog', - ], - }, - }, { # OS!="android" - 'sources!': [ - '../interface/logcat_trace_context.h', - 'logcat_trace_context.cc', - ], - }], - ['OS=="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', - ], - 'link_settings': { - 'libraries': [ '-lrt', ], - }, - }], - ['OS=="mac"', { - 'link_settings': { - 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework', ], - }, - 'sources!': [ - 'atomic32_posix.cc', - ], - }], - ['OS=="ios" or OS=="mac"', { - 'defines': [ - 'WEBRTC_THREAD_RR', - 'WEBRTC_CLOCK_TYPE_REALTIME', - ], - }], - ['OS=="win"', { - 'link_settings': { - 'libraries': [ '-lwinmm.lib', ], - }, - }], - ], # conditions - 'target_conditions': [ - # We need to do this in a target_conditions block to override the - # filename_rules filters. - ['OS=="ios"', { - # Pull in specific Mac files for iOS (which have been filtered out - # by file name rules). - 'sources/': [ - ['include', '^atomic32_mac\\.'], - ], - 'sources!': [ - 'atomic32_posix.cc', - ], - }], - ], - # Disable warnings to enable Win64 build, issue 1323. - 'msvs_disabled_warnings': [ - 4267, # size_t to int truncation. - 4334, # Ignore warning on shift operator promotion. - ], - }, { - 'target_name': 'field_trial_default', - 'type': 'static_library', - 'sources': [ - 'field_trial_default.cc', - ], - 'dependencies': [ - 'system_wrappers', - ] - }, { - 'target_name': 'metrics_default', - 'type': 'static_library', - 'sources': [ - 'metrics_default.cc', - ], - 'dependencies': [ - 'system_wrappers', - ] - }, { - 'target_name': 'system_wrappers_default', - 'type': 'static_library', - 'dependencies': [ - 'field_trial_default', - 'metrics_default', - ] - }, - ], # targets - 'conditions': [ - ['OS=="android"', { - 'targets': [ - { - 'target_name': 'cpu_features_android', - 'type': 'static_library', - 'sources': [ - 'cpu_features_android.c', - ], - 'conditions': [ - ['android_webview_build == 1', { - 'libraries': [ - 'cpufeatures.a' - ], - }, { - 'dependencies': [ - '<(android_ndk_root)/android_tools_ndk.gyp:cpu_features', - ], - }], - ], - }, - ], - }], - ], # conditions + 'includes': [ '../system_wrappers.gypi', ], } diff --git a/webrtc/system_wrappers/system_wrappers.gyp b/webrtc/system_wrappers/system_wrappers.gyp new file mode 100644 index 0000000000..dfebb00ec8 --- /dev/null +++ b/webrtc/system_wrappers/system_wrappers.gyp @@ -0,0 +1,12 @@ +# Copyright (c) 2012 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. + +{ + 'includes': [ 'system_wrappers.gypi', ], +} + diff --git a/webrtc/system_wrappers/system_wrappers.gypi b/webrtc/system_wrappers/system_wrappers.gypi new file mode 100644 index 0000000000..221305b624 --- /dev/null +++ b/webrtc/system_wrappers/system_wrappers.gypi @@ -0,0 +1,241 @@ +# Copyright (c) 2012 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. + +{ + 'includes': [ '../build/common.gypi', ], + 'targets': [ + { + 'target_name': 'system_wrappers', + 'type': 'static_library', + 'dependencies': [ + '../base/base.gyp:rtc_base_approved', + ], + 'sources': [ + 'interface/aligned_array.h', + 'interface/aligned_malloc.h', + 'interface/atomic32.h', + 'interface/clock.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/logcat_trace_context.h', + 'interface/logging.h', + 'interface/metrics.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_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_posix.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.cc', + 'source/data_log_c.cc', + 'source/data_log_no_op.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/logcat_trace_context.cc', + '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', + ], + 'conditions': [ + ['enable_data_logging==1', { + 'sources!': [ 'source/data_log_no_op.cc', ], + }, { + 'sources!': [ 'source/data_log.cc', ], + },], + ['OS=="android"', { + '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', + ], + 'dependencies': [ 'cpu_features_android', ], + 'link_settings': { + 'libraries': [ + '-llog', + ], + }, + }, { # OS!="android" + 'sources!': [ + 'interface/logcat_trace_context.h', + 'source/logcat_trace_context.cc', + ], + }], + ['OS=="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', + ], + 'link_settings': { + 'libraries': [ '-lrt', ], + }, + }], + ['OS=="mac"', { + 'link_settings': { + 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework', ], + }, + 'sources!': [ + 'source/atomic32_posix.cc', + ], + }], + ['OS=="ios" or OS=="mac"', { + 'defines': [ + 'WEBRTC_THREAD_RR', + 'WEBRTC_CLOCK_TYPE_REALTIME', + ], + }], + ['OS=="win"', { + 'link_settings': { + 'libraries': [ '-lwinmm.lib', ], + }, + }], + ], # conditions + 'target_conditions': [ + # We need to do this in a target_conditions block to override the + # filename_rules filters. + ['OS=="ios"', { + # Pull in specific Mac files for iOS (which have been filtered out + # by file name rules). + 'sources/': [ + ['include', '^source/atomic32_mac\\.'], + ], + 'sources!': [ + 'source/atomic32_posix.cc', + ], + }], + ], + # Disable warnings to enable Win64 build, issue 1323. + 'msvs_disabled_warnings': [ + 4267, # size_t to int truncation. + 4334, # Ignore warning on shift operator promotion. + ], + }, { + 'target_name': 'field_trial_default', + 'type': 'static_library', + 'sources': [ + 'source/field_trial_default.cc', + ], + 'dependencies': [ + 'system_wrappers', + ] + }, { + 'target_name': 'metrics_default', + 'type': 'static_library', + 'sources': [ + 'source/metrics_default.cc', + ], + 'dependencies': [ + 'system_wrappers', + ] + }, { + 'target_name': 'system_wrappers_default', + 'type': 'static_library', + 'dependencies': [ + 'field_trial_default', + 'metrics_default', + ] + }, + ], # targets + 'conditions': [ + ['OS=="android"', { + 'targets': [ + { + 'target_name': 'cpu_features_android', + 'type': 'static_library', + 'sources': [ + 'source/cpu_features_android.c', + ], + 'conditions': [ + ['android_webview_build == 1', { + 'libraries': [ + 'cpufeatures.a' + ], + }, { + 'dependencies': [ + '<(android_ndk_root)/android_tools_ndk.gyp:cpu_features', + ], + }], + ], + }, + ], + }], + ], # conditions +} + diff --git a/webrtc/system_wrappers/source/system_wrappers_tests.gyp b/webrtc/system_wrappers/system_wrappers_tests.gyp index 1877592065..da2fe7432f 100644 --- a/webrtc/system_wrappers/source/system_wrappers_tests.gyp +++ b/webrtc/system_wrappers/system_wrappers_tests.gyp @@ -7,44 +7,44 @@ # be found in the AUTHORS file in the root of the source tree. { - 'includes': ['../../build/common.gypi',], + 'includes': ['../build/common.gypi',], 'targets': [ { 'target_name': 'system_wrappers_unittests', 'type': '<(gtest_target_type)', 'dependencies': [ '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/test/test.gyp:test_support_main', ], 'sources': [ - 'aligned_array_unittest.cc', - 'aligned_malloc_unittest.cc', - 'clock_unittest.cc', - 'condition_variable_unittest.cc', - 'critical_section_unittest.cc', - 'event_tracer_unittest.cc', - 'logging_unittest.cc', - 'data_log_unittest.cc', - 'data_log_unittest_disabled.cc', - 'data_log_helpers_unittest.cc', - 'data_log_c_helpers_unittest.c', - 'data_log_c_helpers_unittest.h', - 'rtp_to_ntp_unittest.cc', - 'scoped_vector_unittest.cc', - 'stringize_macros_unittest.cc', - 'stl_util_unittest.cc', - 'thread_unittest.cc', - 'thread_posix_unittest.cc', + 'source/aligned_array_unittest.cc', + 'source/aligned_malloc_unittest.cc', + 'source/clock_unittest.cc', + 'source/condition_variable_unittest.cc', + 'source/critical_section_unittest.cc', + 'source/event_tracer_unittest.cc', + 'source/logging_unittest.cc', + 'source/data_log_unittest.cc', + 'source/data_log_unittest_disabled.cc', + 'source/data_log_helpers_unittest.cc', + 'source/data_log_c_helpers_unittest.c', + 'source/data_log_c_helpers_unittest.h', + 'source/rtp_to_ntp_unittest.cc', + 'source/scoped_vector_unittest.cc', + 'source/stringize_macros_unittest.cc', + 'source/stl_util_unittest.cc', + 'source/thread_unittest.cc', + 'source/thread_posix_unittest.cc', ], 'conditions': [ ['enable_data_logging==1', { - 'sources!': [ 'data_log_unittest_disabled.cc', ], + 'sources!': [ 'source/data_log_unittest_disabled.cc', ], }, { - 'sources!': [ 'data_log_unittest.cc', ], + 'sources!': [ 'source/data_log_unittest.cc', ], }], ['os_posix==0', { - 'sources!': [ 'thread_posix_unittest.cc', ], + 'sources!': [ 'source/thread_posix_unittest.cc', ], }], ['OS=="android"', { 'dependencies': [ @@ -79,7 +79,7 @@ 'system_wrappers_unittests', ], 'includes': [ - '../../build/isolate.gypi', + '../build/isolate.gypi', ], 'sources': [ 'system_wrappers_unittests.isolate', diff --git a/webrtc/system_wrappers/source/system_wrappers_unittests.isolate b/webrtc/system_wrappers/system_wrappers_unittests.isolate index ec8166402b..ec8166402b 100644 --- a/webrtc/system_wrappers/source/system_wrappers_unittests.isolate +++ b/webrtc/system_wrappers/system_wrappers_unittests.isolate diff --git a/webrtc/test/metrics.gyp b/webrtc/test/metrics.gyp index 0486a7c9ea..eda0b054ee 100644 --- a/webrtc/test/metrics.gyp +++ b/webrtc/test/metrics.gyp @@ -21,7 +21,7 @@ 'type': 'static_library', 'dependencies': [ '<(webrtc_root)/common_video/common_video.gyp:common_video', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'sources': [ 'testsupport/metrics/video_metrics.h', diff --git a/webrtc/test/test.gyp b/webrtc/test/test.gyp index d261fd237b..03e05291a1 100644 --- a/webrtc/test/test.gyp +++ b/webrtc/test/test.gyp @@ -17,7 +17,7 @@ 'type': 'static_library', 'dependencies': [ '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'sources': [ 'channel_transport/channel_transport.cc', @@ -75,7 +75,7 @@ 'field_trial.h', ], 'dependencies': [ - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], }, { @@ -88,7 +88,7 @@ 'field_trial', '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:metrics_default', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default', ], }, { @@ -97,7 +97,7 @@ 'dependencies': [ '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/testing/gmock.gyp:gmock', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'sources': [ 'testsupport/fileutils.cc', @@ -129,7 +129,7 @@ '<(DEPTH)/testing/gmock.gyp:gmock', '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:metrics_default', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default', ], 'sources': [ 'run_all_unittests.cc', diff --git a/webrtc/tools/tools.gyp b/webrtc/tools/tools.gyp index edac118e47..7e90511f64 100644 --- a/webrtc/tools/tools.gyp +++ b/webrtc/tools/tools.gyp @@ -91,7 +91,7 @@ 'type': 'executable', 'dependencies': [ '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers_default', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', ], 'sources': [ 'force_mic_volume_max/force_mic_volume_max.cc', @@ -120,7 +120,7 @@ 'dependencies': [ '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers_default', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', '<(webrtc_root)/test/test.gyp:channel_transport', '<(webrtc_root)/test/test.gyp:test_support', 'agc_manager', @@ -137,7 +137,7 @@ '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', '<(webrtc_root)/test/test.gyp:test_support', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers_default', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', 'agc_manager', ], 'sources': [ @@ -163,7 +163,7 @@ 'dependencies': [ '<(webrtc_root)/test/test.gyp:channel_transport', '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers_default', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', ], diff --git a/webrtc/video_engine/test/auto_test/vie_auto_test.gypi b/webrtc/video_engine/test/auto_test/vie_auto_test.gypi index c8886d8f5e..b72dfccac7 100644 --- a/webrtc/video_engine/test/auto_test/vie_auto_test.gypi +++ b/webrtc/video_engine/test/auto_test/vie_auto_test.gypi @@ -12,8 +12,8 @@ 'target_name': 'vie_auto_test', 'type': 'executable', 'dependencies': [ - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:metrics_default', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default', '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_impl', '<(webrtc_root)/modules/modules.gyp:video_render_module_internal_impl', '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine', diff --git a/webrtc/video_engine/test/libvietest/libvietest.gypi b/webrtc/video_engine/test/libvietest/libvietest.gypi index 33d0b0f734..10b3b0ef88 100644 --- a/webrtc/video_engine/test/libvietest/libvietest.gypi +++ b/webrtc/video_engine/test/libvietest/libvietest.gypi @@ -11,7 +11,7 @@ 'target_name': 'libvietest', 'type': 'static_library', 'dependencies': [ - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', '<(DEPTH)/testing/gtest.gyp:gtest', '<(webrtc_root)/test/test.gyp:test_support', 'video_engine_core', diff --git a/webrtc/video_engine/video_engine_core.gypi b/webrtc/video_engine/video_engine_core.gypi index 763d0bee4a..72e1c64c34 100644 --- a/webrtc/video_engine/video_engine_core.gypi +++ b/webrtc/video_engine/video_engine_core.gypi @@ -31,7 +31,7 @@ '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine', # system_wrappers - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'sources': [ # interface diff --git a/webrtc/voice_engine/voice_engine.gyp b/webrtc/voice_engine/voice_engine.gyp index 83b356d719..13c4754a3a 100644 --- a/webrtc/voice_engine/voice_engine.gyp +++ b/webrtc/voice_engine/voice_engine.gyp @@ -24,7 +24,7 @@ '<(webrtc_root)/modules/modules.gyp:media_file', '<(webrtc_root)/modules/modules.gyp:rtp_rtcp', '<(webrtc_root)/modules/modules.gyp:webrtc_utility', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'sources': [ '../common_types.h', @@ -119,7 +119,7 @@ '<(webrtc_root)/modules/modules.gyp:media_file', '<(webrtc_root)/modules/modules.gyp:rtp_rtcp', '<(webrtc_root)/modules/modules.gyp:webrtc_utility', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/test/test.gyp:test_support_main', ], 'sources': [ @@ -147,8 +147,8 @@ '<(DEPTH)/testing/gmock.gyp:gmock', '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers_default', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', '<(webrtc_root)/test/test.gyp:channel_transport', '<(webrtc_root)/test/test.gyp:test_support', ], @@ -215,8 +215,8 @@ 'voice_engine', '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers_default', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', '<(webrtc_root)/test/test.gyp:channel_transport', '<(webrtc_root)/test/test.gyp:test_support', ], @@ -236,7 +236,7 @@ 'type': 'executable', 'dependencies': [ 'voice_engine', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/test/test.gyp:test_support', ], 'sources': [ diff --git a/webrtc/webrtc.gyp b/webrtc/webrtc.gyp index 91bde7e1e0..aa63c1c4b8 100644 --- a/webrtc/webrtc.gyp +++ b/webrtc/webrtc.gyp @@ -32,7 +32,7 @@ 'libjingle/xmpp/xmpp.gyp:*', 'modules/modules.gyp:*', 'p2p/p2p.gyp:*', - 'system_wrappers/source/system_wrappers.gyp:*', + 'system_wrappers/system_wrappers.gyp:*', 'video_engine/video_engine.gyp:*', 'voice_engine/voice_engine.gyp:*', '<(webrtc_vp8_dir)/vp8.gyp:*', @@ -51,7 +51,7 @@ ['include_tests==1', { 'dependencies': [ 'common_video/common_video_unittests.gyp:*', - 'system_wrappers/source/system_wrappers_tests.gyp:*', + 'system_wrappers/system_wrappers_tests.gyp:*', 'test/metrics.gyp:*', 'test/test.gyp:*', 'test/webrtc_test_common.gyp:webrtc_test_common_unittests', diff --git a/webrtc/webrtc_examples.gyp b/webrtc/webrtc_examples.gyp index 4d63110021..03b5df764f 100644 --- a/webrtc/webrtc_examples.gyp +++ b/webrtc/webrtc_examples.gyp @@ -18,7 +18,7 @@ '<(DEPTH)/third_party/icu/icu.gyp:icuuc', '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_impl', '<(webrtc_root)/modules/modules.gyp:video_render_module_internal_impl', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers_default', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', '<(webrtc_root)/test/test.gyp:channel_transport', '<(webrtc_root)/video_engine/video_engine.gyp:video_engine_core', '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine', diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi index 34d777d065..3f772eb4be 100644 --- a/webrtc/webrtc_tests.gypi +++ b/webrtc/webrtc_tests.gypi @@ -58,7 +58,7 @@ 'test/webrtc_test_common.gyp:webrtc_test_renderer', '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_impl', '<(webrtc_root)/modules/modules.gyp:video_render_module_impl', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', 'test/test.gyp:test_main', 'webrtc', ], @@ -86,7 +86,7 @@ 'test/webrtc_test_common.gyp:webrtc_test_renderer', '<(webrtc_root)/modules/modules.gyp:video_capture_module_impl', '<(webrtc_root)/modules/modules.gyp:video_render_module_impl', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers_default', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', 'webrtc', ], }, |