summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsherouk <sherouk@google.com>2015-08-24 08:21:59 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-24 15:22:27 +0000
commitce1c7d78768cc1e139f0896033ae21f2398fa794 (patch)
treeeac7dbf085aa9d69836373fb8262fefdb7865bd5
parent29fdfd0b26a59be0349fa30849cd9721896843f5 (diff)
downloadchromium_src-ce1c7d78768cc1e139f0896033ae21f2398fa794.zip
chromium_src-ce1c7d78768cc1e139f0896033ae21f2398fa794.tar.gz
chromium_src-ce1c7d78768cc1e139f0896033ae21f2398fa794.tar.bz2
Adding net to dependencies.
Removing //gin from dependency on iOS. BUG=459705 Review URL: https://codereview.chromium.org/1306753003 Cr-Commit-Position: refs/heads/master@{#345069}
-rw-r--r--BUILD.gn2
-rw-r--r--net/BUILD.gn4
2 files changed, 4 insertions, 2 deletions
diff --git a/BUILD.gn b/BUILD.gn
index cb1880b..5ec13e1 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -68,6 +68,7 @@ group("both_gn_and_gyp") {
"//base:base_unittests",
"//sql:sql_unittests",
"//ui/base:ui_base_unittests",
+ "//net:net_unittests",
]
if (!is_ios) {
@@ -107,7 +108,6 @@ group("both_gn_and_gyp") {
"//net:hpack_fuzz_mutator",
"//net:hpack_fuzz_wrapper",
"//net:net_perftests",
- "//net:net_unittests",
"//ppapi:ppapi_unittests",
"//ppapi/examples/2d",
"//ppapi/examples/audio",
diff --git a/net/BUILD.gn b/net/BUILD.gn
index fae9f3d..d7173ce 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1362,7 +1362,6 @@ test("net_unittests") {
"//crypto",
"//crypto:platform",
"//crypto:test_support",
- "//gin",
"//net/base/registry_controlled_domains",
"//sql",
"//testing/gmock",
@@ -1371,6 +1370,9 @@ test("net_unittests") {
"//url",
]
+ if (!is_ios) {
+ deps += [ "//gin" ]
+ }
data = [
"data/",
]