Remove remaining mentions of gflags
BUG=webrtc:7644
Review-Url: https://codereview.webrtc.org/3011413002
Cr-Commit-Position: refs/heads/master@{#19950}
diff --git a/.gn b/.gn
index 882d220..c3b2677 100644
--- a/.gn
+++ b/.gn
@@ -67,4 +67,8 @@
# WebRTC relies on Chromium's Android test infrastructure.
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
}
diff --git a/DEPS b/DEPS
index e6907e4..e8169d6 100644
--- a/DEPS
+++ b/DEPS
@@ -83,10 +83,6 @@
'src/tools/swarming_client':
Var('chromium_git') + '/infra/luci/client-py.git' + '@' + Var('swarming_revision'),
# 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':
Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + 'ee2027381105650fb1c66b2b121ba00b79e84d5c',
}
@@ -550,7 +546,6 @@
"-base",
"-chromium",
"+external/webrtc/webrtc", # Android platform build.
- "+gflags",
"+libyuv",
# Individual headers that will be moved out of here, see webrtc:4243.
"+call/rtp_config.h",
diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index 5dca268..b368a0e 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -234,7 +234,6 @@
}
}
-# Exclude tools depending on gflags since that's not available in Chromium.
if (rtc_include_tests) {
if (rtc_enable_protobuf) {
rtc_executable("event_log_visualizer") {
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 36f3539..07c79d5 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -27,7 +27,7 @@
":video_test_common",
]
- if (!build_with_chromium) {
+ if (rtc_include_tests) {
deps += [
":test_main",
":test_support_unittests",
@@ -175,9 +175,7 @@
}
}
-if (!build_with_chromium) {
- # This target used to depend on //third_party/gflags which Chromium does not
- # provide. TODO(oprypin): remove the conditional.
+if (rtc_include_tests) {
rtc_source_set("test_main") {
testonly = true
sources = [
diff --git a/tools_webrtc/autoroller/roll_deps.py b/tools_webrtc/autoroller/roll_deps.py
index 523caba..8a57d78 100755
--- a/tools_webrtc/autoroller/roll_deps.py
+++ b/tools_webrtc/autoroller/roll_deps.py
@@ -22,7 +22,6 @@
# Skip these dependencies (list without solution name prefix).
DONT_AUTOROLL_THESE = [
- 'src/third_party/gflags/src',
'src/third_party/winsdk_samples',
'src/examples/androidtests/third_party/gradle',
]
diff --git a/tools_webrtc/autoroller/unittests/roll_deps_test.py b/tools_webrtc/autoroller/unittests/roll_deps_test.py
index dc2bacd..5c48a86 100755
--- a/tools_webrtc/autoroller/unittests/roll_deps_test.py
+++ b/tools_webrtc/autoroller/unittests/roll_deps_test.py
@@ -107,7 +107,7 @@
self.assertEquals(vars_dict[variable_name], TEST_DATA_VARS[variable_name])
AssertVar('chromium_git')
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)
def testGetMatchingDepsEntriesReturnsPathInSimpleCase(self):
diff --git a/tools_webrtc/autoroller/unittests/testdata/DEPS b/tools_webrtc/autoroller/unittests/testdata/DEPS
index 4cf7677..ff30f0b 100644
--- a/tools_webrtc/autoroller/unittests/testdata/DEPS
+++ b/tools_webrtc/autoroller/unittests/testdata/DEPS
@@ -13,10 +13,6 @@
# Entry that's also a DEPS entry in the Chromium DEPS file.
'src/buildtools':
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 = {