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 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
439 'native_lib_target': 'libcronet', | 439 'native_lib_target': 'libcronet', |
440 'proguard_enabled': 'true', | 440 'proguard_enabled': 'true', |
441 'proguard_flags_paths': [ | 441 'proguard_flags_paths': [ |
442 'cronet/android/proguard.cfg', | 442 'cronet/android/proguard.cfg', |
443 ], | 443 ], |
444 'run_findbugs': 1, | 444 'run_findbugs': 1, |
445 }, | 445 }, |
446 'includes': [ '../build/java_apk.gypi' ], | 446 'includes': [ '../build/java_apk.gypi' ], |
447 }, | 447 }, |
448 { | 448 { |
449 'target_name': 'cronet_unittests', | |
mef
2015/11/18 20:33:25
FWIW cronet_unittests are already included into co
xunjieli
2015/11/18 20:58:44
They are probably executed, but not on Cronet bots
mef
2015/11/18 21:35:33
I don't have particular preference, I just don't t
xunjieli
2015/11/18 21:52:54
Definitely not both. I have moved the other one ov
| |
450 'type': '<(gtest_target_type)', | |
451 'dependencies': [ | |
452 'cronet_static_small', | |
453 '../base/base.gyp:base', | |
454 '../base/base.gyp:test_support_base', | |
455 '../testing/gtest.gyp:gtest', | |
456 '../testing/android/native_test.gyp:native_test_native_code', | |
457 ], | |
458 'sources': [ | |
459 'cronet/run_all_unittests.cc', | |
460 'cronet/url_request_context_config_unittest.cc', | |
461 ], | |
462 }, | |
463 { | |
464 'target_name': 'cronet_unittests_apk', | |
465 'type': 'none', | |
466 'dependencies': [ | |
467 'cronet_unittests', | |
468 ], | |
469 'variables': { | |
470 'test_suite_name': 'cronet_unittests', | |
471 }, | |
472 'includes': [ | |
473 '../build/apk_test.gypi', | |
474 ], | |
475 }, | |
476 { | |
449 'target_name': 'cronet_package', | 477 'target_name': 'cronet_package', |
450 'type': 'none', | 478 'type': 'none', |
451 'dependencies': [ | 479 'dependencies': [ |
452 'libcronet', | 480 'libcronet', |
453 'cronet_java', | 481 'cronet_java', |
454 'cronet_api', | 482 'cronet_api', |
455 '../net/net.gyp:net_unittests_apk', | 483 '../net/net.gyp:net_unittests_apk', |
456 ], | 484 ], |
457 'variables': { | 485 'variables': { |
458 'native_lib': 'libcronet.>(android_product_extension)', | 486 'native_lib': 'libcronet.>(android_product_extension)', |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
598 }, | 626 }, |
599 ], | 627 ], |
600 }, | 628 }, |
601 ], | 629 ], |
602 'variables': { | 630 'variables': { |
603 'enable_data_reduction_proxy_support%': 0, | 631 'enable_data_reduction_proxy_support%': 0, |
604 }, | 632 }, |
605 }], # OS=="android" | 633 }], # OS=="android" |
606 ], | 634 ], |
607 } | 635 } |
OLD | NEW |