| 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 325 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 336             'is_test_apk': 1, | 336             'is_test_apk': 1, | 
| 337           }, | 337           }, | 
| 338           'includes': [ '../build/java_apk.gypi' ], | 338           'includes': [ '../build/java_apk.gypi' ], | 
| 339         }, | 339         }, | 
| 340         { | 340         { | 
| 341           'target_name': 'cronet_tests_jni_headers', | 341           'target_name': 'cronet_tests_jni_headers', | 
| 342           'type': 'none', | 342           'type': 'none', | 
| 343           'sources': [ | 343           'sources': [ | 
| 344             'cronet/android/test/src/org/chromium/net/CronetTestUtil.java', | 344             'cronet/android/test/src/org/chromium/net/CronetTestUtil.java', | 
| 345             'cronet/android/test/src/org/chromium/net/MockUrlRequestJobFactory.j
     ava', | 345             'cronet/android/test/src/org/chromium/net/MockUrlRequestJobFactory.j
     ava', | 
|  | 346             'cronet/android/test/src/org/chromium/net/MockCertVerifier.java', | 
| 346             'cronet/android/test/src/org/chromium/net/NativeTestServer.java', | 347             'cronet/android/test/src/org/chromium/net/NativeTestServer.java', | 
| 347             'cronet/android/test/src/org/chromium/net/NetworkChangeNotifierUtil.
     java', | 348             'cronet/android/test/src/org/chromium/net/NetworkChangeNotifierUtil.
     java', | 
| 348             'cronet/android/test/src/org/chromium/net/QuicTestServer.java', | 349             'cronet/android/test/src/org/chromium/net/QuicTestServer.java', | 
| 349             'cronet/android/test/src/org/chromium/net/SdchObserver.java', | 350             'cronet/android/test/src/org/chromium/net/SdchObserver.java', | 
| 350             'cronet/android/test/src/org/chromium/net/TestUploadDataStreamHandle
     r.java', | 351             'cronet/android/test/src/org/chromium/net/TestUploadDataStreamHandle
     r.java', | 
| 351           ], | 352           ], | 
| 352           'variables': { | 353           'variables': { | 
| 353             'jni_gen_package': 'cronet_tests', | 354             'jni_gen_package': 'cronet_tests', | 
| 354           }, | 355           }, | 
| 355           'includes': [ '../build/jni_generator.gypi' ], | 356           'includes': [ '../build/jni_generator.gypi' ], | 
| 356         }, | 357         }, | 
| 357         { | 358         { | 
| 358           'target_name': 'libcronet_tests', | 359           'target_name': 'libcronet_tests', | 
| 359           'type': 'shared_library', | 360           'type': 'shared_library', | 
| 360           'sources': [ | 361           'sources': [ | 
| 361             'cronet/android/test/cronet_test_jni.cc', | 362             'cronet/android/test/cronet_test_jni.cc', | 
|  | 363             'cronet/android/test/mock_cert_verifier.cc', | 
|  | 364             'cronet/android/test/mock_cert_verifier.h', | 
| 362             'cronet/android/test/mock_url_request_job_factory.cc', | 365             'cronet/android/test/mock_url_request_job_factory.cc', | 
| 363             'cronet/android/test/mock_url_request_job_factory.h', | 366             'cronet/android/test/mock_url_request_job_factory.h', | 
| 364             'cronet/android/test/native_test_server.cc', | 367             'cronet/android/test/native_test_server.cc', | 
| 365             'cronet/android/test/native_test_server.h', | 368             'cronet/android/test/native_test_server.h', | 
| 366             'cronet/android/test/quic_test_server.cc', | 369             'cronet/android/test/quic_test_server.cc', | 
| 367             'cronet/android/test/quic_test_server.h', | 370             'cronet/android/test/quic_test_server.h', | 
| 368             'cronet/android/test/sdch_test_util.cc', | 371             'cronet/android/test/sdch_test_util.cc', | 
| 369             'cronet/android/test/sdch_test_util.h', | 372             'cronet/android/test/sdch_test_util.h', | 
| 370             'cronet/android/test/test_upload_data_stream_handler.cc', | 373             'cronet/android/test/test_upload_data_stream_handler.cc', | 
| 371             'cronet/android/test/test_upload_data_stream_handler.h', | 374             'cronet/android/test/test_upload_data_stream_handler.h', | 
| 372             'cronet/android/test/network_change_notifier_util.cc', | 375             'cronet/android/test/network_change_notifier_util.cc', | 
| 373             'cronet/android/test/network_change_notifier_util.h', | 376             'cronet/android/test/network_change_notifier_util.h', | 
| 374           ], | 377           ], | 
| 375           'dependencies': [ | 378           'dependencies': [ | 
| 376             'cronet_tests_jni_headers', | 379             'cronet_tests_jni_headers', | 
| 377             '../base/base.gyp:base', | 380             '../base/base.gyp:base', | 
| 378             '../net/net.gyp:net', | 381             '../net/net.gyp:net', | 
| 379             '../net/net.gyp:net_quic_proto', | 382             '../net/net.gyp:net_quic_proto', | 
| 380             '../net/net.gyp:net_test_support', | 383             '../net/net.gyp:net_test_support', | 
| 381             '../net/net.gyp:simple_quic_tools', | 384             '../net/net.gyp:simple_quic_tools', | 
| 382             '../url/url.gyp:url_lib', | 385             '../url/url.gyp:url_lib', | 
| 383             '../base/base.gyp:base_i18n', | 386             '../base/base.gyp:base_i18n', | 
| 384             '../third_party/icu/icu.gyp:icui18n', | 387             '../third_party/icu/icu.gyp:icui18n', | 
| 385             '../third_party/icu/icu.gyp:icuuc', | 388             '../third_party/icu/icu.gyp:icuuc', | 
| 386           ], | 389           ], | 
| 387           'defines': [ |  | 
| 388             'CRONET_TEST=1', |  | 
| 389           ], |  | 
| 390           'conditions': [ | 390           'conditions': [ | 
| 391             ['enable_data_reduction_proxy_support==1', | 391             ['enable_data_reduction_proxy_support==1', | 
| 392               { | 392               { | 
| 393                 'dependencies': [ | 393                 'dependencies': [ | 
| 394                   '../components/components.gyp:data_reduction_proxy_core_browse
     r', | 394                   '../components/components.gyp:data_reduction_proxy_core_browse
     r', | 
| 395                 ], | 395                 ], | 
| 396               }, | 396               }, | 
| 397             ], | 397             ], | 
| 398           ], | 398           ], | 
| 399           'includes': [ 'cronet/cronet_static.gypi' ], | 399           'includes': [ 'cronet/cronet_static.gypi' ], | 
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 602             }, | 602             }, | 
| 603           ], | 603           ], | 
| 604         }, | 604         }, | 
| 605       ], | 605       ], | 
| 606       'variables': { | 606       'variables': { | 
| 607         'enable_data_reduction_proxy_support%': 0, | 607         'enable_data_reduction_proxy_support%': 0, | 
| 608       }, | 608       }, | 
| 609     }],  # OS=="android" | 609     }],  # OS=="android" | 
| 610   ], | 610   ], | 
| 611 } | 611 } | 
| OLD | NEW | 
|---|