[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 498 matching lines @@
     if (!is_android_webview_build) {
       deps += [ ":net_jni_headers" ]
     }
   }
 
   if (use_icu_alternatives_on_android) {
     deps -= [
       "//base:i18n",
       "//third_party/icu",
     ]
-    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",
     ]
+  } else {

[mmenke, 2015/02/27 21:32:43]

Shouldn't we be making parallel projects here, too?  Also, should change the
deps-= to deps+=.

[mef, 2015/02/27 22:03:45]

Possibly, but we don't have BUILD.gn for Cronet, so there is no real reason to
create net_small in this CL. Entered
https://code.google.com/p/chromium/issues/detail?id=462737 for GN support.
Done.

+    sources += [
+      "base/filename_util_icu.cc",
+      "base/net_string_util_icu.cc",
+      "base/net_util_icu.cc",
+    ]
   }
 }
 
 grit("net_resources") {
   source = "base/net_resources.grd"
   use_qualified_include = true
   outputs = [
     "grit/net_resources.h",
     "net_resources.pak",
     "net_resources.rc",
@@ skipping 926 matching lines @@
       "quic/quic_server_bin.cc",
     ]
     deps = [
       ":quic_tools",
       ":net",
       "//base",
       "//third_party/boringssl",
     ]
   }
 }  # !is_android && !is_win && !is_mac