[Cronet] Make Cronet buildable on regular Android bots.

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/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/module_args/v8.gni")
 import("//url/config.gni")
 import("//testing/test.gni")
@@ skipping 71 matching lines @@
   include_dirs = []
 
   public_deps = [
     "//crypto",
     "//crypto:platform",
     "//url",
   ]
   deps = [
     ":net_resources",
     "//base",
-    "//base:i18n",
     "//base:prefs",
     "//base/third_party/dynamic_annotations",
     "//net/base/registry_controlled_domains",
     "//sdch",
-    "//third_party/icu",
     "//third_party/zlib",
     "//url",
   ]
 
   if (use_kerberos) {
     defines += [ "USE_KERBEROS" ]
     if (is_android) {
       include_dirs += [ "/usr/include/kerberosV" ]
     }
   } else {
@@ skipping 397 matching lines @@
       "base/platform_mime_util_linux.cc",
     ]
     set_sources_assignment_filter(sources_assignment_filter)
 
     if (!is_android_webview_build) {
       deps += [ ":net_jni_headers" ]
     }
   }
 
   if (use_icu_alternatives_on_android) {
-    deps -= [
+    sources += [
+      "base/net_string_util_icu_alternatives_android.cc",
+      "base/net_string_util_icu_alternatives_android.h",
+    ]
+  } else {
+    deps += [
       "//base:i18n",
       "//third_party/icu",
     ]
-    sources -= [
+    sources += [
       "base/filename_util_icu.cc",
       "base/net_string_util_icu.cc",
       "base/net_util_icu.cc",
     ]
-    sources += [
-      "base/net_string_util_icu_alternatives_android.cc",
-      "base/net_string_util_icu_alternatives_android.h",
-    ]
   }
 }
 
 grit("net_resources") {
   source = "base/net_resources.grd"
   use_qualified_include = true
   outputs = [
     "grit/net_resources.h",
     "net_resources.pak",
     "net_resources.rc",
@@ skipping 405 matching lines @@
   }
 
   executable("run_testserver") {
     testonly = true
     sources = [
       "tools/testserver/run_testserver.cc",
     ]
     deps = [
       ":net",  # TODO(brettw) bug 363749: this shouldn't be necessary. It's not
                # in the GYP build, and can be removed when the bug is fixed.
+
       ":test_support",
       "//base",
       "//base/test:test_support",
       "//testing/gtest",
     ]
   }
 
   executable("stress_cache") {
     testonly = true
     sources = [
@@ skipping 21 matching lines @@
       "//base:i18n",
       "//net/tools/tld_cleanup",
     ]
   }
 }
 
 if (is_linux) {
   static_library("epoll_server") {
     sources = [
       "tools/epoll_server/epoll_server.cc",
+      "tools/epoll_server/epoll_server.h",
       "tools/epoll_server/linux_epoll_server.cc",
-      "tools/epoll_server/epoll_server.h",
     ]
     deps = [
       ":net",
       "//base",
     ]
   }
 
   static_library("flip_in_mem_edsm_server_base") {
     testonly = true
     sources = [
@@ skipping 496 matching lines @@
       "quic/quic_server_bin.cc",
     ]
     deps = [
       ":quic_tools",
       ":net",
       "//base",
       "//third_party/boringssl",
     ]
   }
 }  # !is_android && !is_win && !is_mac