Remove duplicates from libcronet_deps_complete.a

BUG=836347

Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I53cb9dca6a9dd1d874c58d72b36c75e82b1142c4
Reviewed-on: https://chromium-review.googlesource.com/1026415Reviewed-by: Misha Efimov <mef@chromium.org>
Commit-Queue: Andrei Kapishnikov <kapishnikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553895}

components/cronet/ios/BUILD.gn

@@ -161,8 +161,7 @@ action("generate_accept_languages") {
 static_library("cronet_static") {
   visibility = [ ":*" ]
   deps = _cronet_deps
-  deps += [ ":cronet_sources_with_global_state" ]
-  sources = _cronet_sources
+  sources = _cronet_sources + [ "ios_global_state_configuration.cc" ]
   public_configs = [ ":cronet_include_config" ]
   public_deps = [
     "//components/grpc_support",

components/cronet/ios/cronet_consumer/BUILD.gn

@@ -46,7 +46,7 @@ cronet_consumer_template("cronet_consumer") {
 # TODO(mef): Building "cronet_consumer_static" app with additional_target_cpus
 # causes "cronet_static_framework" to build lipo_binary("libcronet") for
 # duplicate architecture (e.g. arm64+arm64) and breaks the build.
-if (!defined(additional_target_cpus)) {
+if (!defined(additional_target_cpus) || additional_target_cpus == []) {
   cronet_consumer_template("cronet_consumer_static") {
     deps = [
       "//components/cronet/ios:cronet_static_framework",