Fix building of bwe_test_logging.cc in gyp and gn builds
bwe_test_logging.cc is supposed to be conditionally built in gyp builds but, due to a path error in the sources! expressions it was always compiled. Meanwhile, compilation of bwe_test_logging.cc was never set up for gn builds. This fixes both of these problems. BUG=604060 Review-Url: https://codereview.webrtc.org/1990373002 Cr-Commit-Position: refs/heads/master@{#12842}
This commit is contained in:
parent
77db86fac7
commit
07df20b51a
@ -6,6 +6,11 @@
|
|||||||
# 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.
|
||||||
|
|
||||||
|
declare_args() {
|
||||||
|
# Set this to true to enable BWE test logging.
|
||||||
|
enable_bwe_test_logging = false
|
||||||
|
}
|
||||||
|
|
||||||
source_set("remote_bitrate_estimator") {
|
source_set("remote_bitrate_estimator") {
|
||||||
sources = [
|
sources = [
|
||||||
"include/bwe_defines.h",
|
"include/bwe_defines.h",
|
||||||
@ -41,6 +46,10 @@ source_set("rbe_components") {
|
|||||||
"transport_feedback_adapter.h",
|
"transport_feedback_adapter.h",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
if (enable_bwe_test_logging) {
|
||||||
|
sources += [ "test/bwe_test_logging.cc" ]
|
||||||
|
}
|
||||||
|
|
||||||
configs += [ "../..:common_config" ]
|
configs += [ "../..:common_config" ]
|
||||||
public_configs = [ "../..:common_inherited_config" ]
|
public_configs = [ "../..:common_inherited_config" ]
|
||||||
deps = [
|
deps = [
|
||||||
|
|||||||
@ -48,7 +48,7 @@
|
|||||||
}, {
|
}, {
|
||||||
'defines': [ 'BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0' ],
|
'defines': [ 'BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0' ],
|
||||||
'sources!': [
|
'sources!': [
|
||||||
'remote_bitrate_estimator/test/bwe_test_logging.cc'
|
'test/bwe_test_logging.cc'
|
||||||
],
|
],
|
||||||
}],
|
}],
|
||||||
],
|
],
|
||||||
@ -99,7 +99,7 @@
|
|||||||
}, {
|
}, {
|
||||||
'defines': [ 'BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0' ],
|
'defines': [ 'BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0' ],
|
||||||
'sources!': [
|
'sources!': [
|
||||||
'remote_bitrate_estimator/test/bwe_test_logging.cc'
|
'test/bwe_test_logging.cc'
|
||||||
],
|
],
|
||||||
}],
|
}],
|
||||||
],
|
],
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user