Remove remaining mentions of gflags

Bug: webrtc:7644
Change-Id: I1906419e597fe6f80247e8def78c958f3759ba00
Reviewed-on: https://webrtc-review.googlesource.com/2687
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Henrik Kjellander <kjellander@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#19938}
This commit is contained in:
Oleh Prypin 2017-09-25 10:27:22 +02:00 committed by Commit Bot
parent 5c53641b51
commit 90ce84e1d3
7 changed files with 165 additions and 176 deletions

4
.gn
View File

@ -67,4 +67,8 @@ default_args = {
# 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
}

5
DEPS
View File

@ -83,10 +83,6 @@ deps = {
'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 @@ include_rules = [
"-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",

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_enable_protobuf) {
rtc_executable("event_log_visualizer") {

View File

@ -175,10 +175,7 @@ rtc_source_set("test_support") {
}
}
if (!build_with_chromium) {
# 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
sources = [
"test_main.cc",
@ -194,9 +191,9 @@ if (!build_with_chromium) {
"//testing/gmock",
"//testing/gtest",
]
}
}
rtc_source_set("video_test_support") {
rtc_source_set("video_test_support") {
testonly = true
sources = [
@ -250,9 +247,9 @@ if (!build_with_chromium) {
if (rtc_use_memcheck) {
data = valgrind_webrtc_dependencies
}
}
}
rtc_source_set("test_support_test_output") {
rtc_source_set("test_support_test_output") {
testonly = true
sources = [
"testsupport/test_output.cc",
@ -262,9 +259,9 @@ if (!build_with_chromium) {
":fileutils",
"../rtc_base:rtc_base_approved",
]
}
}
test_support_unittests_resources = [
test_support_unittests_resources = [
"../resources/foreman_cif_short.yuv",
"../resources/video_coding/frame-ethernet-ii.pcap",
"../resources/video_coding/frame-loopback.pcap",
@ -272,9 +269,9 @@ if (!build_with_chromium) {
"../resources/video_coding/pltype103_header_only.rtp",
"../resources/video_coding/ssrcs-2.pcap",
"../resources/video_coding/ssrcs-3.pcap",
]
]
if (is_ios) {
if (is_ios) {
bundle_data("test_support_unittests_bundle_data") {
testonly = true
sources = test_support_unittests_resources
@ -282,9 +279,9 @@ if (!build_with_chromium) {
"{{bundle_resources_dir}}/{{source_file_part}}",
]
}
}
}
rtc_test("test_support_unittests") {
rtc_test("test_support_unittests") {
deps = [
":fake_audio_device",
":rtp_test_utils",
@ -348,7 +345,6 @@ if (!build_with_chromium) {
"//testing/gmock",
"//testing/gtest",
]
}
}
if (is_ios) {

View File

@ -22,7 +22,6 @@ import urllib
# 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',
]

View File

@ -107,7 +107,7 @@ class TestRollChromiumRevision(unittest.TestCase):
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):

View File

@ -13,10 +13,6 @@ deps = {
# 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 = {