[Mac/GN] Do not include unnecessary bundle data from //net.

net/BUILD.gn

Index: net/BUILD.gn
diff --git a/net/BUILD.gn b/net/BUILD.gn
index ef793f70c23a3fd665e1ea46f8b87ca956f1cd60..481c64b2f62c78130561d9e7db4265e98c0b8544 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -496,14 +496,16 @@ if (!is_ios) {
   }
 }
 
-bundle_data("test_support_bundle_data") {
-  visibility = [ ":test_support" ]
-  testonly = true
-  sources = gypi_values.net_test_support_data_sources
-  outputs = [
-    "{{bundle_resources_dir}}/" +
-        "{{source_root_relative_dir}}/{{source_file_part}}",
-  ]
+if (is_ios) {

[sdefresne, 2016/07/22 15:36:48]

We generally define the bundle_data target on all platform (at least we do in
the other files), so no need for is_ios here.

[Robert Sesek, 2016/07/22 17:05:10]

Done.

+  bundle_data("test_support_bundle_data") {
+    visibility = [ ":test_support" ]
+    testonly = true
+    sources = gypi_values.net_test_support_data_sources
+    outputs = [
+      "{{bundle_resources_dir}}/" +
+          "{{source_root_relative_dir}}/{{source_file_part}}",
+    ]
+  }
 }
 
 static_library("test_support") {
@@ -629,9 +631,11 @@ static_library("test_support") {
     "//url",
   ]
 
-  deps = [
-    ":test_support_bundle_data",
-  ]
+  deps = []
+
+  if (is_ios) {
+    deps += [ ":test_support_bundle_data" ]
+  }
 
   data = [
     "data/",
@@ -1315,13 +1319,15 @@ if (!is_ios) {
   }
 }
 
-bundle_data("net_unittests_bundle_data") {
-  testonly = true
-  sources = gypi_values.net_unittests_data_sources
-  outputs = [
-    "{{bundle_resources_dir}}/" +
-        "{{source_root_relative_dir}}/{{source_file_part}}",
-  ]
+if (is_ios) {

[sdefresne, 2016/07/22 15:36:48]

ditto

[Robert Sesek, 2016/07/22 17:05:10]

Done.

+  bundle_data("net_unittests_bundle_data") {
+    testonly = true
+    sources = gypi_values.net_unittests_data_sources
+    outputs = [
+      "{{bundle_resources_dir}}/" +
+          "{{source_root_relative_dir}}/{{source_file_part}}",
+    ]
+  }
 }
 
 test("net_unittests") {
@@ -1339,7 +1345,6 @@ test("net_unittests") {
     ":balsa",
     ":extras",
     ":net",
-    ":net_unittests_bundle_data",
     ":simple_quic_tools",
     ":stale_while_revalidate_experiment_domains",
     ":test_support",
@@ -1546,6 +1551,8 @@ test("net_unittests") {
       "socket/unix_domain_client_socket_posix_unittest.cc",
       "socket/unix_domain_server_socket_posix_unittest.cc",
     ]
+
+    deps += [ ":net_unittests_bundle_data" ]

[sdefresne, 2016/07/22 15:36:48]

nit: you could use bundle_deps instead to increase parallelism (no need to
depend on those stamp to build the executable target)

bundle_deps = [ ":net_unittests_bundle_data" ]

[Robert Sesek, 2016/07/22 17:05:10]

Good call. Done.

   }
 
   # Unit tests that aren't supported by the current ICU alternatives on Android.