Index: webrtc/test/BUILD.gn |
diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn |
index c696979dd11105b7c4aed5bc81b74c28fca2978f..b3d11d26f0707b76defd0c328f8a850b2550e900 100644 |
--- a/webrtc/test/BUILD.gn |
+++ b/webrtc/test/BUILD.gn |
@@ -116,6 +116,53 @@ if (is_ios) { |
} |
} |
+rtc_source_set("test_support") { |
+ testonly = true |
+ |
+ sources = [ |
+ "gmock.h", |
+ "gtest.h", |
+ "testsupport/packet_reader.cc", |
+ "testsupport/packet_reader.h", |
+ "testsupport/perf_test.cc", |
+ "testsupport/perf_test.h", |
+ "testsupport/trace_to_stderr.cc", |
+ "testsupport/trace_to_stderr.h", |
+ "testsupport/unittest_utils.h", |
+ ] |
+ |
+ deps = [ |
+ "..:webrtc_common", |
+ "../base:gtest_prod", |
+ "../base:rtc_base_approved", |
+ "../common_video", |
+ "../system_wrappers", |
+ "//testing/gmock", |
+ "//testing/gtest", |
+ ] |
+ |
+ public_deps = [ |
+ ":fileutils", |
+ ] |
+ |
+ if (!build_with_chromium && is_clang) { |
+ # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
+ suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
+ } |
+ |
+ if (is_android) { |
+ deps += [ "//base:base" ] |
+ } |
+ |
+ if (is_ios) { |
+ deps += [ "//webrtc/sdk:rtc_sdk_common_objc" ] |
kjellander_webrtc
2017/04/28 08:56:48
You need to change this to be a relative path now,
mbonadei
2017/04/28 09:05:57
Thanks!
|
+ } |
+ |
+ if (rtc_use_memcheck) { |
+ data = valgrind_webrtc_dependencies |
+ } |
+} |
+ |
if (!build_with_chromium) { |
# This target depends on //third_party/gflags and since chromium does not |
# have gflags it causes an error when Gn parses this BUILD.gn file. |
@@ -186,53 +233,17 @@ if (!build_with_chromium) { |
} |
} |
- rtc_source_set("test_support") { |
+ rtc_source_set("test_support_isolated_output") { |
testonly = true |
- |
sources = [ |
- "gmock.h", |
- "gtest.h", |
"testsupport/isolated_output.cc", |
"testsupport/isolated_output.h", |
- "testsupport/packet_reader.cc", |
- "testsupport/packet_reader.h", |
- "testsupport/perf_test.cc", |
- "testsupport/perf_test.h", |
- "testsupport/trace_to_stderr.cc", |
- "testsupport/trace_to_stderr.h", |
- "testsupport/unittest_utils.h", |
] |
- |
deps = [ |
- "../base:gtest_prod", |
+ ":fileutils", |
"../base:rtc_base_approved", |
- "../common_video", |
- "../system_wrappers", |
- "//testing/gmock", |
- "//testing/gtest", |
"//third_party/gflags", |
] |
- |
- public_deps = [ |
- ":fileutils", |
- ] |
- |
- if (!build_with_chromium && is_clang) { |
- # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
- suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
- } |
- |
- if (is_android) { |
- deps += [ "//base:base" ] |
- } |
- |
- if (is_ios) { |
- deps += [ "//webrtc/sdk:rtc_sdk_common_objc" ] |
- } |
- |
- if (rtc_use_memcheck) { |
- data = valgrind_webrtc_dependencies |
- } |
} |
rtc_test("test_support_unittests") { |