| 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" and use_icu_alternatives_on_android==1', { | 7 ['OS=="android" and use_icu_alternatives_on_android==1', { |
| 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 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 405 'variables': { | 405 'variables': { |
| 406 'jni_gen_package': 'cronet_tests', | 406 'jni_gen_package': 'cronet_tests', |
| 407 }, | 407 }, |
| 408 'includes': [ '../build/jni_generator.gypi' ], | 408 'includes': [ '../build/jni_generator.gypi' ], |
| 409 }, | 409 }, |
| 410 { | 410 { |
| 411 'target_name': 'libcronet_tests', | 411 'target_name': 'libcronet_tests', |
| 412 'type': 'shared_library', | 412 'type': 'shared_library', |
| 413 'sources': [ | 413 'sources': [ |
| 414 'cronet/android/test/cronet_tests_jni.cc', | 414 'cronet/android/test/cronet_tests_jni.cc', |
| 415 '../net/base/directory_lister.cc', |
| 416 '../net/base/directory_lister.h', |
| 417 '../net/url_request/url_request_file_job.cc', |
| 418 '../net/url_request/url_request_file_job.h', |
| 415 ], | 419 ], |
| 416 'dependencies': [ | 420 'dependencies': [ |
| 417 'cronet_static', | 421 'cronet_static', |
| 418 'cronet_tests_jni_headers', | 422 'cronet_tests_jni_headers', |
| 419 '../base/base.gyp:base', | 423 '../base/base.gyp:base', |
| 420 '../net/net.gyp:net', | 424 '../net/net.gyp:net', |
| 425 '../net/net.gyp:net_test_support', |
| 421 '../net/net.gyp:quic_tools', | 426 '../net/net.gyp:quic_tools', |
| 422 '../url/url.gyp:url_lib', | 427 '../url/url.gyp:url_lib', |
| 428 '../base/base.gyp:base_i18n', |
| 429 '../third_party/icu/icu.gyp:icui18n', |
| 430 '../third_party/icu/icu.gyp:icuuc', |
| 423 ], | 431 ], |
| 424 }, | 432 }, |
| 425 { | 433 { |
| 426 'target_name': 'cronet_test_apk', | 434 'target_name': 'cronet_test_apk', |
| 427 'type': 'none', | 435 'type': 'none', |
| 428 'dependencies': [ | 436 'dependencies': [ |
| 429 'cronet', | 437 'cronet', |
| 430 ], | 438 ], |
| 431 'variables': { | 439 'variables': { |
| 432 'apk_name': 'CronetTest', | 440 'apk_name': 'CronetTest', |
| 433 'java_in_dir': 'cronet/android/test', | 441 'java_in_dir': 'cronet/android/test', |
| 434 'resource_dir': 'cronet/android/test/res', | 442 'resource_dir': 'cronet/android/test/res', |
| 443 'asset_location': 'cronet/android/test/assets', |
| 435 'native_lib_target': 'libcronet_tests', | 444 'native_lib_target': 'libcronet_tests', |
| 436 }, | 445 }, |
| 437 'includes': [ '../build/java_apk.gypi' ], | 446 'includes': [ '../build/java_apk.gypi' ], |
| 438 }, | 447 }, |
| 439 { | 448 { |
| 440 # cronet_test_apk creates a .jar as a side effect. Any java targets | 449 # cronet_test_apk creates a .jar as a side effect. Any java targets |
| 441 # that need that .jar in their classpath should depend on this target, | 450 # that need that .jar in their classpath should depend on this target, |
| 442 # cronet_sample_apk_java. Dependents of cronet_test_apk receive its | 451 # cronet_sample_apk_java. Dependents of cronet_test_apk receive its |
| 443 # jar path in the variable 'apk_output_jar_path'. This target should | 452 # jar path in the variable 'apk_output_jar_path'. This target should |
| 444 # only be used by targets which instrument cronet_test_apk. | 453 # only be used by targets which instrument cronet_test_apk. |
| (...skipping 18 matching lines...) Expand all Loading... |
| 463 'java_in_dir': 'cronet/android/test/javatests', | 472 'java_in_dir': 'cronet/android/test/javatests', |
| 464 'resource_dir': 'cronet/android/test/res', | 473 'resource_dir': 'cronet/android/test/res', |
| 465 'is_test_apk': 1, | 474 'is_test_apk': 1, |
| 466 }, | 475 }, |
| 467 'includes': [ '../build/java_apk.gypi' ], | 476 'includes': [ '../build/java_apk.gypi' ], |
| 468 }, | 477 }, |
| 469 ], | 478 ], |
| 470 }], # OS=="android" | 479 }], # OS=="android" |
| 471 ], | 480 ], |
| 472 } | 481 } |
| OLD | NEW |