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', | |
mef
2014/09/16 22:02:35
Interesting, does it actually work? We are buildin
xunjieli
2014/09/16 22:14:47
That's one of my concerns too. Matt, any thoughts?
mmenke
2014/09/16 22:14:57
I believe this only works because we don't actuall
| |
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', |
(...skipping 30 matching lines...) Expand all Loading... | |
463 'java_in_dir': 'cronet/android/test/javatests', | 471 'java_in_dir': 'cronet/android/test/javatests', |
464 'resource_dir': 'cronet/android/test/res', | 472 'resource_dir': 'cronet/android/test/res', |
465 'is_test_apk': 1, | 473 'is_test_apk': 1, |
466 }, | 474 }, |
467 'includes': [ '../build/java_apk.gypi' ], | 475 'includes': [ '../build/java_apk.gypi' ], |
468 }, | 476 }, |
469 ], | 477 ], |
470 }], # OS=="android" | 478 }], # OS=="android" |
471 ], | 479 ], |
472 } | 480 } |
OLD | NEW |