summaryrefslogtreecommitdiffstats
path: root/BUILD.gn
diff options
context:
space:
mode:
authordpranke <dpranke@chromium.org>2016-02-23 11:57:46 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-23 19:58:55 +0000
commit0e5462ce39fd05b41ec66850f473ac6327284409 (patch)
treee687a700ddf54ca7c7b051fcacce2dbcbdf209f2 /BUILD.gn
parentde67d0745862cdc53b533cb5c35fa7ba9e9d89d9 (diff)
downloadchromium_src-0e5462ce39fd05b41ec66850f473ac6327284409.zip
chromium_src-0e5462ce39fd05b41ec66850f473ac6327284409.tar.gz
chromium_src-0e5462ce39fd05b41ec66850f473ac6327284409.tar.bz2
Remove the 'ios_use_webrtc' build flag hack.
For a time we needed to enable (parts of) the WebRTC GN build on iOS, because there was an indirect dependency on WebRTC in order for some components to be able to depend on xmllite. Those components have since been switched to depend on libxml2, and so there is no reason for Chromium to build WebRTC on iOS now (though WebRTC is free to build on iOS on its own). This CL cleans up the build configs accordingly. R=brettw@chromium.org, kjellander@chromium.org, sdefresne@chromium.org BUG=538497 CQ_INCLUDE_TRYBOTS=tryserver.chromium.mac:ios_rel_device_gn,ios_dbg_simulator_gn Review URL: https://codereview.chromium.org/1718073002 Cr-Commit-Position: refs/heads/master@{#377070}
Diffstat (limited to 'BUILD.gn')
-rw-r--r--BUILD.gn16
1 files changed, 5 insertions, 11 deletions
diff --git a/BUILD.gn b/BUILD.gn
index f80621b..ae90772 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -12,7 +12,6 @@ import("//build/config/features.gni")
import("//build/config/sanitizers/sanitizers.gni")
import("//build/config/ui.gni")
import("//build_overrides/v8.gni")
-import("//build_overrides/webrtc.gni")
import("//media/media_options.gni")
import("//third_party/openh264/openh264_args.gni")
@@ -199,23 +198,18 @@ group("both_gn_and_gyp") {
]
} else {
deps += [
+ #"//ios/chrome:ios_chrome_unittests", TODO(GYP)
+ #"//ios/chrome/app", TODO(GYP)
+ #"//ios/chrome/browser", TODO(GYP)
+ "//ios/chrome/common",
"//ios/net:ios_net_unittests",
+ "//ios/public/provider/chrome/browser",
"//ios/public/provider/web",
"//ios/testing:ocmock_support_unittest",
"//ios/third_party/ochamcrest",
"//ios/web:ios_web_unittests",
"//ios/web/shell:ios_web_shell",
]
-
- if (ios_use_webrtc) {
- deps += [
- "//ios/chrome:ios_chrome_unittests",
- "//ios/chrome/app",
- "//ios/chrome/browser",
- "//ios/chrome/common",
- "//ios/public/provider/chrome/browser",
- ]
- }
}
deps += root_extra_deps