Move under enable_google_benchmarks targets that rely on the benchmarks
Some targets depends on targets under enable_google_benchmarks. But they are not under such if statement themeself. Bug: webrtc:12404 Change-Id: I7c0b9a75bd3fa18090ef6a44fda22ed5f33d79b0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/204063 Commit-Queue: Andrey Logvin <landrey@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33104}
This commit is contained in:

committed by
Commit Bot

parent
133c0524f3
commit
5e227abfe9
3
BUILD.gn
3
BUILD.gn
@ -14,6 +14,7 @@
|
|||||||
|
|
||||||
import("//build/config/linux/pkg_config.gni")
|
import("//build/config/linux/pkg_config.gni")
|
||||||
import("//build/config/sanitizers/sanitizers.gni")
|
import("//build/config/sanitizers/sanitizers.gni")
|
||||||
|
import("//third_party/google_benchmark/buildconfig.gni")
|
||||||
import("webrtc.gni")
|
import("webrtc.gni")
|
||||||
if (rtc_enable_protobuf) {
|
if (rtc_enable_protobuf) {
|
||||||
import("//third_party/protobuf/proto_library.gni")
|
import("//third_party/protobuf/proto_library.gni")
|
||||||
@ -584,6 +585,7 @@ if (rtc_include_tests) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (enable_google_benchmarks) {
|
||||||
rtc_test("benchmarks") {
|
rtc_test("benchmarks") {
|
||||||
testonly = true
|
testonly = true
|
||||||
deps = [
|
deps = [
|
||||||
@ -591,6 +593,7 @@ if (rtc_include_tests) {
|
|||||||
"test:benchmark_main",
|
"test:benchmark_main",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
# This runs tests that must run in real time and therefore can take some
|
# This runs tests that must run in real time and therefore can take some
|
||||||
# time to execute. They are in a separate executable to avoid making the
|
# time to execute. They are in a separate executable to avoid making the
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
|
|
||||||
import("//build/config/crypto.gni")
|
import("//build/config/crypto.gni")
|
||||||
import("//build/config/ui.gni")
|
import("//build/config/ui.gni")
|
||||||
|
import("//third_party/google_benchmark/buildconfig.gni")
|
||||||
import("../webrtc.gni")
|
import("../webrtc.gni")
|
||||||
|
|
||||||
if (is_android) {
|
if (is_android) {
|
||||||
@ -1539,11 +1540,13 @@ if (rtc_include_tests) {
|
|||||||
"../test:test_support",
|
"../test:test_support",
|
||||||
"memory:fifo_buffer",
|
"memory:fifo_buffer",
|
||||||
"synchronization:mutex",
|
"synchronization:mutex",
|
||||||
"synchronization:synchronization_unittests",
|
|
||||||
"task_utils:pending_task_safety_flag",
|
"task_utils:pending_task_safety_flag",
|
||||||
"task_utils:to_queued_task",
|
"task_utils:to_queued_task",
|
||||||
"third_party/sigslot",
|
"third_party/sigslot",
|
||||||
]
|
]
|
||||||
|
if (enable_google_benchmarks) {
|
||||||
|
deps += [ "synchronization:synchronization_unittests" ]
|
||||||
|
}
|
||||||
if (is_win) {
|
if (is_win) {
|
||||||
sources += [
|
sources += [
|
||||||
"win32_unittest.cc",
|
"win32_unittest.cc",
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
# in the file PATENTS. All contributing project authors may
|
# in the file PATENTS. All contributing project authors may
|
||||||
# be found in the AUTHORS file in the root of the source tree.
|
# be found in the AUTHORS file in the root of the source tree.
|
||||||
|
|
||||||
|
import("//third_party/google_benchmark/buildconfig.gni")
|
||||||
import("../../webrtc.gni")
|
import("../../webrtc.gni")
|
||||||
if (is_android) {
|
if (is_android) {
|
||||||
import("//build/config/android/config.gni")
|
import("//build/config/android/config.gni")
|
||||||
@ -73,6 +74,7 @@ rtc_library("yield_policy") {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (rtc_include_tests) {
|
if (rtc_include_tests) {
|
||||||
|
if (enable_google_benchmarks) {
|
||||||
rtc_library("synchronization_unittests") {
|
rtc_library("synchronization_unittests") {
|
||||||
testonly = true
|
testonly = true
|
||||||
sources = [
|
sources = [
|
||||||
@ -102,6 +104,7 @@ if (rtc_include_tests) {
|
|||||||
"//third_party/google_benchmark",
|
"//third_party/google_benchmark",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
rtc_library("sequence_checker_unittests") {
|
rtc_library("sequence_checker_unittests") {
|
||||||
testonly = true
|
testonly = true
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
# be found in the AUTHORS file in the root of the source tree.
|
# be found in the AUTHORS file in the root of the source tree.
|
||||||
|
|
||||||
import("//build/config/ui.gni")
|
import("//build/config/ui.gni")
|
||||||
|
import("//third_party/google_benchmark/buildconfig.gni")
|
||||||
import("../webrtc.gni")
|
import("../webrtc.gni")
|
||||||
if (is_android) {
|
if (is_android) {
|
||||||
import("//build/config/android/rules.gni")
|
import("//build/config/android/rules.gni")
|
||||||
@ -445,12 +446,14 @@ if (rtc_include_tests) {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (enable_google_benchmarks) {
|
||||||
rtc_library("benchmark_main") {
|
rtc_library("benchmark_main") {
|
||||||
testonly = true
|
testonly = true
|
||||||
sources = [ "benchmark_main.cc" ]
|
sources = [ "benchmark_main.cc" ]
|
||||||
|
|
||||||
deps = [ "//third_party/google_benchmark" ]
|
deps = [ "//third_party/google_benchmark" ]
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
rtc_library("test_support_test_artifacts") {
|
rtc_library("test_support_test_artifacts") {
|
||||||
testonly = true
|
testonly = true
|
||||||
|
Reference in New Issue
Block a user