Make it possible to build cronet without icu.

net/net.gyp

 # Copyright 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.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'linux_link_kerberos%': 0,
     'use_tracing_cache_backend%': 0,
@@ skipping 421 matching lines @@
               'cert/test_root_certs_openssl.cc',
             ],
             # The net/android/keystore_openssl.cc source file needs to
             # access an OpenSSL-internal header.
             'include_dirs': [
               '../third_party/openssl',
             ],
           },
         ],
         [ 'use_icu_alternatives_on_android == 1', {
+            'dependencies!': [
+              '../base/base.gyp:base_i18n',
+              '../third_party/icu/icu.gyp:icui18n',
+              '../third_party/icu/icu.gyp:icuuc',
+            ],
             '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',
             ],
           },
         ],
       ],
       'target_conditions': [
         # These source files are excluded by default platform rules, but they
@@ skipping 180 matching lines @@
             ],
           },
         ],
         [ 'enable_built_in_dns!=1', {
             'sources!': [
               'dns/address_sorter_posix_unittest.cc',
               'dns/address_sorter_unittest.cc',
             ],
           },
         ],
-        [ 'use_v8_in_net==1', {
+        # Always need use_v8_in_net to be 1 to run gyp on Android, so just
+        # remove net_unittest's dependency on v8 when using icu alternatives
+        # instead of setting use_v8_in_net to 0.
+        [ 'use_v8_in_net==1 and use_icu_alternatives_on_android==0', {
             'dependencies': [
               'net_with_v8',
             ],
           }, {  # else: !use_v8_in_net
             'sources!': [
               'proxy/proxy_resolver_v8_unittest.cc',
               'proxy/proxy_resolver_v8_tracing_unittest.cc',
             ],
           },
         ],
@@ skipping 87 matching lines @@
         [ 'OS == "android"', {
             'dependencies': [
               '../third_party/openssl/openssl.gyp:openssl',
             ],
             'sources!': [
               'dns/dns_config_service_posix_unittest.cc',
             ],
           },
         ],
         ['OS == "android" and gtest_target_type == "shared_library"', {
+          # TODO(mmenke):  This depends on test_support_base, which depends on
+          #                icu.  Figure out a way to remove that dependency.
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ]
         }],
+        [ 'use_icu_alternatives_on_android == 1', {
+            'dependencies!': [
+              '../base/base.gyp:base_i18n',
+            ],
+            'sources!': [
+              'base/filename_util_unittest.cc',
+              'base/net_util_icu_unittest.cc',
+            ],
+          },
+        ],
       ],
       'target_conditions': [
         # These source files are excluded by default platform rules, but they
         # are needed in specific cases on other platforms. Re-including them can
         # only be done in target_conditions as it is evaluated after the
         # platform rules.
         ['OS == "android"', {
           'sources/': [
             ['include', '^base/address_tracker_linux_unittest\\.cc$'],
           ],
@@ skipping 50 matching lines @@
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../net/tools/tld_cleanup/tld_cleanup.gyp:tld_cleanup_util',
         '../testing/gtest.gyp:gtest',
         '../testing/gmock.gyp:gmock',
         '../url/url.gyp:url_lib',
         'net',
       ],
       'export_dependent_settings': [
         '../base/base.gyp:base',
+        # TODO(mmenke):  This depends on icu, figure out a way to build tests
+        #                without icu.
         '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
         '../testing/gmock.gyp:gmock',
       ],
       'sources': [
         'base/capturing_net_log.cc',
         'base/capturing_net_log.h',
         'base/load_timing_info_test_util.cc',
         'base/load_timing_info_test_util.h',
         'base/mock_file_stream.cc',
@@ skipping 774 matching lines @@
             'net_unittests.isolate',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }