| 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 362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 373 ], | 373 ], |
| 374 ], | 374 ], |
| 375 'includes': [ 'cronet/cronet_static.gypi' ], | 375 'includes': [ 'cronet/cronet_static.gypi' ], |
| 376 }, | 376 }, |
| 377 { | 377 { |
| 378 'target_name': 'cronet_test_apk', | 378 'target_name': 'cronet_test_apk', |
| 379 'type': 'none', | 379 'type': 'none', |
| 380 'dependencies': [ | 380 'dependencies': [ |
| 381 'cronet_java', | 381 'cronet_java', |
| 382 '../net/net.gyp:net_java_test_support', | 382 '../net/net.gyp:net_java_test_support', |
| 383 '../third_party/netty-tcnative/netty-tcnative.gyp:netty-tcnative', |
| 384 '../third_party/netty-tcnative/netty-tcnative.gyp:netty-tcnative-so'
, |
| 385 '../third_party/netty/netty.gyp:netty_all', |
| 383 ], | 386 ], |
| 384 'variables': { | 387 'variables': { |
| 385 'apk_name': 'CronetTest', | 388 'apk_name': 'CronetTest', |
| 386 'java_in_dir': 'cronet/android/test', | 389 'java_in_dir': 'cronet/android/test', |
| 387 'resource_dir': 'cronet/android/test/res', | 390 'resource_dir': 'cronet/android/test/res', |
| 388 'asset_location': 'cronet/android/test/assets', | 391 'asset_location': 'cronet/android/test/assets', |
| 389 'native_lib_target': 'libcronet_tests', | 392 'native_lib_target': 'libcronet_tests', |
| 393 'additional_bundled_libs': [ |
| 394 '<(PRODUCT_DIR)/libnetty-tcnative.so', |
| 395 ], |
| 390 'run_findbugs': 1, | 396 'run_findbugs': 1, |
| 391 }, | 397 }, |
| 392 'includes': [ '../build/java_apk.gypi' ], | 398 'includes': [ '../build/java_apk.gypi' ], |
| 393 }, | 399 }, |
| 394 { | 400 { |
| 395 # cronet_test_apk creates a .jar as a side effect. Any java targets | 401 # cronet_test_apk creates a .jar as a side effect. Any java targets |
| 396 # that need that .jar in their classpath should depend on this target, | 402 # that need that .jar in their classpath should depend on this target, |
| 397 # cronet_test_apk_java. Dependents of cronet_test_apk receive its | 403 # cronet_test_apk_java. Dependents of cronet_test_apk receive its |
| 398 # jar path in the variable 'apk_output_jar_path'. This target should | 404 # jar path in the variable 'apk_output_jar_path'. This target should |
| 399 # only be used by targets which instrument cronet_test_apk. | 405 # only be used by targets which instrument cronet_test_apk. |
| (...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 623 }, | 629 }, |
| 624 ], | 630 ], |
| 625 }, | 631 }, |
| 626 ], | 632 ], |
| 627 'variables': { | 633 'variables': { |
| 628 'enable_data_reduction_proxy_support%': 0, | 634 'enable_data_reduction_proxy_support%': 0, |
| 629 }, | 635 }, |
| 630 }], # OS=="android" | 636 }], # OS=="android" |
| 631 ], | 637 ], |
| 632 } | 638 } |
| OLD | NEW |