admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove remaining mentions of gflags

Browse Source 
BUG=webrtc:7644

Review-Url: https://codereview.webrtc.org/3011413002
Cr-Commit-Position: refs/heads/master@{#19950}
This commit is contained in:
oprypin 2017-09-25 08:34:41 -07:00 committed by Commit Bot
parent 6b3e1a2bbd
commit fbbba3f771
7 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gn
View File

@ -67,4 +67,8 @@ default_args = {
# WebRTC relies on Chromium's Android test infrastructure. # WebRTC relies on Chromium's Android test infrastructure.
use_cxx11_on_android = false use_cxx11_on_android = false
# WebRTC does not provide the gflags dependency. Because libyuv uses it only
# for unittests, it can be disabled (see third_party/libyuv/BUILD.gn)
libyuv_use_gflags = false
} }

5
DEPS
View File

@ -83,10 +83,6 @@ deps = {
'src/tools/swarming_client': 'src/tools/swarming_client':
Var('chromium_git') + '/infra/luci/client-py.git' + '@' + Var('swarming_revision'), Var('chromium_git') + '/infra/luci/client-py.git' + '@' + Var('swarming_revision'),
# WebRTC-only dependencies (not present in Chromium). # WebRTC-only dependencies (not present in Chromium).
'src/third_party/gflags':
Var('webrtc_git') + '/deps/third_party/gflags' + '@' + '892576179b45861b53e04a112996a738309cf364',
'src/third_party/gflags/src':
Var('chromium_git') + '/external/github.com/gflags/gflags' + '@' + '03bebcb065c83beff83d50ae025a55a4bf94dfca',
'src/third_party/gtest-parallel': 'src/third_party/gtest-parallel':
Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + 'ee2027381105650fb1c66b2b121ba00b79e84d5c', Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + 'ee2027381105650fb1c66b2b121ba00b79e84d5c',
} }
@ -550,7 +546,6 @@ include_rules = [
"-base", "-base",
"-chromium", "-chromium",
"+external/webrtc/webrtc", # Android platform build. "+external/webrtc/webrtc", # Android platform build.
"+gflags",
"+libyuv", "+libyuv",
# Individual headers that will be moved out of here, see webrtc:4243. # Individual headers that will be moved out of here, see webrtc:4243.
"+call/rtp_config.h", "+call/rtp_config.h",

1
rtc_tools/BUILD.gn
View File

@ -234,7 +234,6 @@ if (!build_with_chromium) {
} }
} }
# Exclude tools depending on gflags since that's not available in Chromium.
if (rtc_include_tests) { if (rtc_include_tests) {
if (rtc_enable_protobuf) { if (rtc_enable_protobuf) {
rtc_executable("event_log_visualizer") { rtc_executable("event_log_visualizer") {

6
test/BUILD.gn
View File

@ -27,7 +27,7 @@ group("test") {
":video_test_common", ":video_test_common",
] ]
if (!build_with_chromium) { if (rtc_include_tests) {
deps += [ deps += [
":test_main", ":test_main",
":test_support_unittests", ":test_support_unittests",
@ -175,9 +175,7 @@ rtc_source_set("test_support") {
} }
} }
if (!build_with_chromium) { if (rtc_include_tests) {
# This target used to depend on //third_party/gflags which Chromium does not
# provide. TODO(oprypin): remove the conditional.
rtc_source_set("test_main") { rtc_source_set("test_main") {
testonly = true testonly = true
sources = [ sources = [

1
tools_webrtc/autoroller/roll_deps.py
View File

@ -22,7 +22,6 @@ import urllib
# Skip these dependencies (list without solution name prefix). # Skip these dependencies (list without solution name prefix).
DONT_AUTOROLL_THESE = [ DONT_AUTOROLL_THESE = [
'src/third_party/gflags/src',
'src/third_party/winsdk_samples', 'src/third_party/winsdk_samples',
'src/examples/androidtests/third_party/gradle', 'src/examples/androidtests/third_party/gradle',
] ]

2
tools_webrtc/autoroller/unittests/roll_deps_test.py
View File

@ -107,7 +107,7 @@ class TestRollChromiumRevision(unittest.TestCase):
self.assertEquals(vars_dict[variable_name], TEST_DATA_VARS[variable_name]) self.assertEquals(vars_dict[variable_name], TEST_DATA_VARS[variable_name])
AssertVar('chromium_git') AssertVar('chromium_git')
AssertVar('chromium_revision') AssertVar('chromium_revision')
self.assertEquals(len(local_scope['deps']), 3) self.assertEquals(len(local_scope['deps']), 2)
self.assertEquals(len(local_scope['deps_os']), 1) self.assertEquals(len(local_scope['deps_os']), 1)
def testGetMatchingDepsEntriesReturnsPathInSimpleCase(self): def testGetMatchingDepsEntriesReturnsPathInSimpleCase(self):

4
tools_webrtc/autoroller/unittests/testdata/DEPS vendored
View File

@ -13,10 +13,6 @@ deps = {
# Entry that's also a DEPS entry in the Chromium DEPS file. # Entry that's also a DEPS entry in the Chromium DEPS file.
'src/buildtools': 'src/buildtools':
Var('chromium_git') + '/chromium/buildtools.git' + '@' + '64e38f0cebdde27aa0cfb405f330063582f9ac76', Var('chromium_git') + '/chromium/buildtools.git' + '@' + '64e38f0cebdde27aa0cfb405f330063582f9ac76',
# Entry only present in WebRTC, not Chromium.
'src/third_party/gflags/src':
Var('chromium_git') + '/external/github.com/gflags/gflags@03bebcb065c83beff83d50ae025a55a4bf94dfca',
} }
deps_os = { deps_os = {