| OLD | NEW | 
|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 { | 5 { | 
| 6   'conditions': [ | 6   'conditions': [ | 
| 7     ['OS=="android"', { | 7     ['OS=="android"', { | 
| 8       # TODO(mef): Figure out what needs to be done for gn script. | 8       # TODO(mef): Figure out what needs to be done for gn script. | 
| 9       'targets': [ | 9       'targets': [ | 
| 10         { | 10         { | 
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 157           # ICU alternatives which requires file and ftp support be disabled. | 157           # ICU alternatives which requires file and ftp support be disabled. | 
| 158           'target_name': 'cronet_static_small', | 158           'target_name': 'cronet_static_small', | 
| 159           'type': 'static_library', | 159           'type': 'static_library', | 
| 160           'defines': [ | 160           'defines': [ | 
| 161             'USE_ICU_ALTERNATIVES_ON_ANDROID=1', | 161             'USE_ICU_ALTERNATIVES_ON_ANDROID=1', | 
| 162             'DISABLE_FILE_SUPPORT=1', | 162             'DISABLE_FILE_SUPPORT=1', | 
| 163             'DISABLE_FTP_SUPPORT=1', | 163             'DISABLE_FTP_SUPPORT=1', | 
| 164           ], | 164           ], | 
| 165           'dependencies': [ | 165           'dependencies': [ | 
| 166             '../net/net.gyp:net_small', | 166             '../net/net.gyp:net_small', | 
|  | 167             '../url/url.gyp:url_lib_use_icu_alternatives_on_android', | 
| 167           ], | 168           ], | 
| 168           'conditions': [ | 169           'conditions': [ | 
| 169             ['enable_data_reduction_proxy_support==1', | 170             ['enable_data_reduction_proxy_support==1', | 
| 170               { | 171               { | 
| 171                 'dependencies': [ | 172                 'dependencies': [ | 
| 172                   '../components/components.gyp:data_reduction_proxy_core_browse
     r_small', | 173                   '../components/components.gyp:data_reduction_proxy_core_browse
     r_small', | 
| 173                 ], | 174                 ], | 
| 174               }, | 175               }, | 
| 175             ], | 176             ], | 
| 176           ], | 177           ], | 
| 177           'includes': [ 'cronet/cronet_static.gypi' ], | 178           'includes': [ 'cronet/cronet_static.gypi' ], | 
| 178         }, | 179         }, | 
| 179         { | 180         { | 
| 180           # cronet_static target depends on ICU and includes file and ftp suppor
     t. | 181           # cronet_static target depends on ICU and includes file and ftp suppor
     t. | 
| 181           'target_name': 'cronet_static', | 182           'target_name': 'cronet_static', | 
| 182           'type': 'static_library', | 183           'type': 'static_library', | 
| 183           'dependencies': [ | 184           'dependencies': [ | 
| 184             '../base/base.gyp:base_i18n', | 185             '../base/base.gyp:base_i18n', | 
| 185             '../net/net.gyp:net', | 186             '../net/net.gyp:net', | 
|  | 187             '../url/url.gyp:url_lib', | 
| 186           ], | 188           ], | 
| 187           'conditions': [ | 189           'conditions': [ | 
| 188             ['enable_data_reduction_proxy_support==1', | 190             ['enable_data_reduction_proxy_support==1', | 
| 189               { | 191               { | 
| 190                 'dependencies': [ | 192                 'dependencies': [ | 
| 191                   '../components/components.gyp:data_reduction_proxy_core_browse
     r', | 193                   '../components/components.gyp:data_reduction_proxy_core_browse
     r', | 
| 192                 ], | 194                 ], | 
| 193               }, | 195               }, | 
| 194             ], | 196             ], | 
| 195           ], | 197           ], | 
| 196           'includes': [ 'cronet/cronet_static.gypi' ], | 198           'includes': [ 'cronet/cronet_static.gypi' ], | 
| 197         }, | 199         }, | 
| 198         { | 200         { | 
| 199           'target_name': 'libcronet', | 201           'target_name': 'libcronet', | 
| 200           'type': 'shared_library', | 202           'type': 'shared_library', | 
| 201           'sources': [ | 203           'sources': [ | 
| 202             'cronet/android/cronet_jni.cc', | 204             'cronet/android/cronet_jni.cc', | 
| 203           ], | 205           ], | 
| 204           'dependencies': [ | 206           'dependencies': [ | 
| 205             'cronet_static_small', | 207             'cronet_static_small', | 
| 206             '../base/base.gyp:base', | 208             '../base/base.gyp:base', | 
| 207             '../net/net.gyp:net_small', | 209             '../net/net.gyp:net_small', | 
| 208             '../url/url.gyp:url_lib_use_icu_alternatives_on_android', |  | 
| 209           ], | 210           ], | 
| 210         }, | 211         }, | 
| 211         { # cronet_api.jar defines Cronet API and provides implementation of | 212         { # cronet_api.jar defines Cronet API and provides implementation of | 
| 212           # legacy api using HttpUrlConnection (not the Chromium stack). | 213           # legacy api using HttpUrlConnection (not the Chromium stack). | 
| 213           'target_name': 'cronet_api', | 214           'target_name': 'cronet_api', | 
| 214           'type': 'none', | 215           'type': 'none', | 
| 215           'dependencies': [ | 216           'dependencies': [ | 
| 216             'cronet_engine_builder_list', | 217             'cronet_engine_builder_list', | 
| 217             'cronet_version', | 218             'cronet_version', | 
| 218             'load_states_list', | 219             'load_states_list', | 
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 356             'cronet/android/test/network_change_notifier_util.cc', | 357             'cronet/android/test/network_change_notifier_util.cc', | 
| 357             'cronet/android/test/network_change_notifier_util.h', | 358             'cronet/android/test/network_change_notifier_util.h', | 
| 358           ], | 359           ], | 
| 359           'dependencies': [ | 360           'dependencies': [ | 
| 360             'cronet_tests_jni_headers', | 361             'cronet_tests_jni_headers', | 
| 361             '../base/base.gyp:base', | 362             '../base/base.gyp:base', | 
| 362             '../net/net.gyp:net', | 363             '../net/net.gyp:net', | 
| 363             '../net/net.gyp:net_quic_proto', | 364             '../net/net.gyp:net_quic_proto', | 
| 364             '../net/net.gyp:net_test_support', | 365             '../net/net.gyp:net_test_support', | 
| 365             '../net/net.gyp:simple_quic_tools', | 366             '../net/net.gyp:simple_quic_tools', | 
| 366             '../url/url.gyp:url_lib', |  | 
| 367             '../base/base.gyp:base_i18n', | 367             '../base/base.gyp:base_i18n', | 
| 368             '../third_party/icu/icu.gyp:icui18n', | 368             '../third_party/icu/icu.gyp:icui18n', | 
| 369             '../third_party/icu/icu.gyp:icuuc', | 369             '../third_party/icu/icu.gyp:icuuc', | 
| 370           ], | 370           ], | 
| 371           'conditions': [ | 371           'conditions': [ | 
| 372             ['enable_data_reduction_proxy_support==1', | 372             ['enable_data_reduction_proxy_support==1', | 
| 373               { | 373               { | 
| 374                 'dependencies': [ | 374                 'dependencies': [ | 
| 375                   '../components/components.gyp:data_reduction_proxy_core_browse
     r', | 375                   '../components/components.gyp:data_reduction_proxy_core_browse
     r', | 
| 376                 ], | 376                 ], | 
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 439             'native_lib_target': 'libcronet', | 439             'native_lib_target': 'libcronet', | 
| 440             'proguard_enabled': 'true', | 440             'proguard_enabled': 'true', | 
| 441             'proguard_flags_paths': [ | 441             'proguard_flags_paths': [ | 
| 442               'cronet/android/proguard.cfg', | 442               'cronet/android/proguard.cfg', | 
| 443             ], | 443             ], | 
| 444             'run_findbugs': 1, | 444             'run_findbugs': 1, | 
| 445           }, | 445           }, | 
| 446           'includes': [ '../build/java_apk.gypi' ], | 446           'includes': [ '../build/java_apk.gypi' ], | 
| 447         }, | 447         }, | 
| 448         { | 448         { | 
|  | 449           'target_name': 'cronet_unittests', | 
|  | 450           'type': '<(gtest_target_type)', | 
|  | 451           'dependencies': [ | 
|  | 452             'cronet_static', | 
|  | 453             'metrics', | 
|  | 454             '../base/base.gyp:base', | 
|  | 455             '../base/base.gyp:test_support_base', | 
|  | 456             '../testing/gtest.gyp:gtest', | 
|  | 457             '../testing/android/native_test.gyp:native_test_native_code', | 
|  | 458           ], | 
|  | 459           'sources': [ | 
|  | 460             'cronet/run_all_unittests.cc', | 
|  | 461             'cronet/url_request_context_config_unittest.cc', | 
|  | 462             'cronet/histogram_manager_unittest.cc', | 
|  | 463           ], | 
|  | 464         }, | 
|  | 465         { | 
|  | 466           'target_name': 'cronet_unittests_apk', | 
|  | 467           'type': 'none', | 
|  | 468           'dependencies': [ | 
|  | 469             'cronet_unittests', | 
|  | 470           ], | 
|  | 471           'variables': { | 
|  | 472             'test_suite_name': 'cronet_unittests', | 
|  | 473           }, | 
|  | 474           'includes': [ | 
|  | 475             '../build/apk_test.gypi', | 
|  | 476           ], | 
|  | 477         }, | 
|  | 478         { | 
| 449           'target_name': 'cronet_package', | 479           'target_name': 'cronet_package', | 
| 450           'type': 'none', | 480           'type': 'none', | 
| 451           'dependencies': [ | 481           'dependencies': [ | 
| 452             'libcronet', | 482             'libcronet', | 
| 453             'cronet_java', | 483             'cronet_java', | 
| 454             'cronet_api', | 484             'cronet_api', | 
| 455             '../net/net.gyp:net_unittests_apk', | 485             '../net/net.gyp:net_unittests_apk', | 
| 456           ], | 486           ], | 
| 457           'variables': { | 487           'variables': { | 
| 458             'native_lib': 'libcronet.>(android_product_extension)', | 488             'native_lib': 'libcronet.>(android_product_extension)', | 
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 598             }, | 628             }, | 
| 599           ], | 629           ], | 
| 600         }, | 630         }, | 
| 601       ], | 631       ], | 
| 602       'variables': { | 632       'variables': { | 
| 603         'enable_data_reduction_proxy_support%': 0, | 633         'enable_data_reduction_proxy_support%': 0, | 
| 604       }, | 634       }, | 
| 605     }],  # OS=="android" | 635     }],  # OS=="android" | 
| 606   ], | 636   ], | 
| 607 } | 637 } | 
| OLD | NEW | 
|---|