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

net/BUILD.gn

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/buildflag_header.gni")
 import("//build/config/chromecast_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
@@ skipping 478 matching lines @@
     deps = [
       ":net",
       ":test_support",
       "//base",
       "//build/config/sanitizers:deps",
       "//build/win:default_exe_manifest",
     ]
   }
 }
 
-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") {
   testonly = true
   sources = [
     "base/load_timing_info_test_util.cc",
     "base/load_timing_info_test_util.h",
     "base/mock_file_stream.cc",
     "base/mock_file_stream.h",
     "base/test_completion_callback.cc",
@@ skipping 105 matching lines @@
     "//base",
     "//base/test:test_support",
     "//crypto",
     "//net",
     "//net/tools/tld_cleanup",
     "//testing/gmock",
     "//testing/gtest",
     "//url",
   ]
 
-  deps = [
-    ":test_support_bundle_data",
-  ]
+  deps = []
+
+  if (is_ios) {
+    deps += [ ":test_support_bundle_data" ]
+  }
 
   data = [
     "data/",
   ]
 
   if (!is_ios) {
     public_deps += [ "//third_party/protobuf:py_proto" ]
   }
 
   if (use_nss_certs) {
@@ skipping 663 matching lines @@
     ]
     deps = [
       ":net",
       "//base",
       "//build/config/sanitizers:deps",
       "//build/win:default_exe_manifest",
     ]
   }
 }
 
-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") {
   sources = gypi_values.net_test_sources
 
   configs += [
     "//build/config:precompiled_headers",
 
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
   defines = []
 
   deps = [
     ":balsa",
     ":extras",
     ":net",
-    ":net_unittests_bundle_data",
     ":simple_quic_tools",
     ":stale_while_revalidate_experiment_domains",
     ":test_support",
     "//base",
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
     "//crypto",
     "//crypto:platform",
     "//crypto:test_support",
     "//net/base/registry_controlled_domains",
@@ skipping 186 matching lines @@
 
       # Needs GetAppOutput().
       "test/python_utils_unittest.cc",
 
       # The following tests are disabled because they don't apply to
       # iOS.
       # OS is not "linux" or "freebsd" or "openbsd".
       "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.
   if (is_android && use_platform_icu_alternatives) {
     sources -= [
       "base/filename_util_unittest.cc",
       "base/url_util_unittest.cc",
       "cert/x509_certificate_unittest.cc",
       "proxy/proxy_resolver_v8_unittest.cc",
       "url_request/url_request_job_unittest.cc",
@@ skipping 442 matching lines @@
     "url_request/url_request_fuzzer.cc",
   ]
   deps = [
     ":net_fuzzer_test_support",
     ":test_support",
     "//base",
     "//net",
   ]
   dict = "data/fuzzer_dictionaries/net_url_request_fuzzer.dict"
 }