| 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 ], | 375 ], |
| 376 'includes': [ 'cronet/cronet_static.gypi' ], | 376 'includes': [ 'cronet/cronet_static.gypi' ], |
| 377 }, | 377 }, |
| 378 { | 378 { |
| 379 'target_name': 'cronet_test_apk', | 379 'target_name': 'cronet_test_apk', |
| 380 'type': 'none', | 380 'type': 'none', |
| 381 'dependencies': [ | 381 'dependencies': [ |
| 382 'cronet_java', | 382 'cronet_java', |
| 383 'netty-tcnative', |
| 383 '../net/net.gyp:net_java_test_support', | 384 '../net/net.gyp:net_java_test_support', |
| 385 '../third_party/netty4/netty.gyp:netty_all', |
| 384 ], | 386 ], |
| 385 'variables': { | 387 'variables': { |
| 386 'apk_name': 'CronetTest', | 388 'apk_name': 'CronetTest', |
| 387 'java_in_dir': 'cronet/android/test', | 389 'java_in_dir': 'cronet/android/test', |
| 388 'resource_dir': 'cronet/android/test/res', | 390 'resource_dir': 'cronet/android/test/res', |
| 389 'asset_location': 'cronet/android/test/assets', | 391 'asset_location': 'cronet/android/test/assets', |
| 390 'native_lib_target': 'libcronet_tests', | 392 'native_lib_target': 'libcronet_tests', |
| 391 'run_findbugs': 1, | 393 'run_findbugs': 1, |
| 394 'additional_bundled_libs': [ |
| 395 '<(PRODUCT_DIR)/lib/libnetty-tcnative.so', |
| 396 ], |
| 392 }, | 397 }, |
| 393 'includes': [ '../build/java_apk.gypi' ], | 398 'includes': [ '../build/java_apk.gypi' ], |
| 394 }, | 399 }, |
| 395 { | 400 { |
| 396 # 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 |
| 397 # 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, |
| 398 # cronet_test_apk_java. Dependents of cronet_test_apk receive its | 403 # cronet_test_apk_java. Dependents of cronet_test_apk receive its |
| 399 # 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 |
| 400 # only be used by targets which instrument cronet_test_apk. | 405 # only be used by targets which instrument cronet_test_apk. |
| 401 'target_name': 'cronet_test_apk_java', | 406 'target_name': 'cronet_test_apk_java', |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 464 'dependencies': [ | 469 'dependencies': [ |
| 465 'cronet_unittests', | 470 'cronet_unittests', |
| 466 ], | 471 ], |
| 467 'variables': { | 472 'variables': { |
| 468 'test_suite_name': 'cronet_unittests', | 473 'test_suite_name': 'cronet_unittests', |
| 469 }, | 474 }, |
| 470 'includes': [ | 475 'includes': [ |
| 471 '../build/apk_test.gypi', | 476 '../build/apk_test.gypi', |
| 472 ], | 477 ], |
| 473 }, | 478 }, |
| 479 { # builds libnetty-tcnative.so & netty-tcnative.jar |
| 480 'target_name': 'netty-tcnative', |
| 481 'type': 'none', |
| 482 'dependencies': [ |
| 483 '../third_party/netty-tcnative/netty-tcnative.gyp:netty-tcnative-so'
, |
| 484 '../third_party/netty-tcnative/netty-tcnative.gyp:netty-tcnative', |
| 485 ], |
| 486 }, |
| 474 { | 487 { |
| 475 'target_name': 'cronet_package', | 488 'target_name': 'cronet_package', |
| 476 'type': 'none', | 489 'type': 'none', |
| 477 'dependencies': [ | 490 'dependencies': [ |
| 478 'libcronet', | 491 'libcronet', |
| 479 'cronet_java', | 492 'cronet_java', |
| 480 'cronet_api', | 493 'cronet_api', |
| 481 '../net/net.gyp:net_unittests_apk', | 494 '../net/net.gyp:net_unittests_apk', |
| 482 ], | 495 ], |
| 483 'variables': { | 496 'variables': { |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 624 }, | 637 }, |
| 625 ], | 638 ], |
| 626 }, | 639 }, |
| 627 ], | 640 ], |
| 628 'variables': { | 641 'variables': { |
| 629 'enable_data_reduction_proxy_support%': 0, | 642 'enable_data_reduction_proxy_support%': 0, |
| 630 }, | 643 }, |
| 631 }], # OS=="android" | 644 }], # OS=="android" |
| 632 ], | 645 ], |
| 633 } | 646 } |
| OLD | NEW |