| 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 'targets': [ | 8 'targets': [ |
| 9 { | 9 { |
| 10 'target_name': 'cronet_jni_headers', | 10 'target_name': 'cronet_jni_headers', |
| (...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 501 'cronet_test_apk_java', | 501 'cronet_test_apk_java', |
| 502 '../base/base.gyp:base_java_test_support', | 502 '../base/base.gyp:base_java_test_support', |
| 503 '../net/net.gyp:require_net_test_support_apk', | 503 '../net/net.gyp:require_net_test_support_apk', |
| 504 ], | 504 ], |
| 505 'variables': { | 505 'variables': { |
| 506 'apk_name': 'CronetTestInstrumentation', | 506 'apk_name': 'CronetTestInstrumentation', |
| 507 'java_in_dir': 'cronet/android/test/javatests', | 507 'java_in_dir': 'cronet/android/test/javatests', |
| 508 'resource_dir': 'cronet/android/test/res', | 508 'resource_dir': 'cronet/android/test/res', |
| 509 'is_test_apk': 1, | 509 'is_test_apk': 1, |
| 510 'run_findbugs': 1, | 510 'run_findbugs': 1, |
| 511 'test_type': 'instrumentation', |
| 512 'isolate_file': 'cronet/android/cronet_test_instrumentation_apk.isol
ate', |
| 511 'additional_apks': [ | 513 'additional_apks': [ |
| 512 '<(PRODUCT_DIR)/apks/ChromiumNetTestSupport.apk', | 514 '<(PRODUCT_DIR)/apks/ChromiumNetTestSupport.apk', |
| 513 ], | 515 ], |
| 514 }, | 516 }, |
| 515 'includes': [ '../build/java_apk.gypi' ], | 517 'includes': [ |
| 518 '../build/java_apk.gypi', |
| 519 '../build/android/test_runner.gypi', |
| 520 ], |
| 516 }, | 521 }, |
| 517 { | 522 { |
| 518 'target_name': 'cronet_perf_test_apk', | 523 'target_name': 'cronet_perf_test_apk', |
| 519 'type': 'none', | 524 'type': 'none', |
| 520 'dependencies': [ | 525 'dependencies': [ |
| 521 'cronet_java', | 526 'cronet_java', |
| 522 'cronet_api', | 527 'cronet_api', |
| 523 'cronet_test_support', | 528 'cronet_test_support', |
| 524 ], | 529 ], |
| 525 'variables': { | 530 'variables': { |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 720 }, | 725 }, |
| 721 ], | 726 ], |
| 722 }, | 727 }, |
| 723 ], | 728 ], |
| 724 'variables': { | 729 'variables': { |
| 725 'enable_data_reduction_proxy_support%': 0, | 730 'enable_data_reduction_proxy_support%': 0, |
| 726 }, | 731 }, |
| 727 }], # OS=="android" | 732 }], # OS=="android" |
| 728 ], | 733 ], |
| 729 } | 734 } |
| OLD | NEW |