| 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 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 388 ], | 388 ], |
| 389 'includes': [ '../build/apk_fake_jar.gypi' ], | 389 'includes': [ '../build/apk_fake_jar.gypi' ], |
| 390 }, | 390 }, |
| 391 { | 391 { |
| 392 'target_name': 'cronet_sample_test_apk', | 392 'target_name': 'cronet_sample_test_apk', |
| 393 'type': 'none', | 393 'type': 'none', |
| 394 'dependencies': [ | 394 'dependencies': [ |
| 395 'cronet', | 395 'cronet', |
| 396 'cronet_sample_apk_java', | 396 'cronet_sample_apk_java', |
| 397 'cronet_stub', | 397 'cronet_stub', |
| 398 '../base/base.gyp:base_java', | |
| 399 '../base/base.gyp:base_java_test_support', | 398 '../base/base.gyp:base_java_test_support', |
| 400 ], | 399 ], |
| 401 'variables': { | 400 'variables': { |
| 402 'apk_name': 'CronetSampleTest', | 401 'apk_name': 'CronetSampleTest', |
| 403 'java_in_dir': 'cronet/android/sample/javatests', | 402 'java_in_dir': 'cronet/android/sample/javatests', |
| 404 'resource_dir': 'cronet/android/sample/res', | 403 'resource_dir': 'cronet/android/sample/res', |
| 405 'is_test_apk': 1, | 404 'is_test_apk': 1, |
| 406 }, | 405 }, |
| 407 'includes': [ '../build/java_apk.gypi' ], | 406 'includes': [ '../build/java_apk.gypi' ], |
| 408 }, | 407 }, |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 454 'java_in_dir': 'cronet/android/test', | 453 'java_in_dir': 'cronet/android/test', |
| 455 'resource_dir': 'cronet/android/test/res', | 454 'resource_dir': 'cronet/android/test/res', |
| 456 'asset_location': 'cronet/android/test/assets', | 455 'asset_location': 'cronet/android/test/assets', |
| 457 'native_lib_target': 'libcronet_tests', | 456 'native_lib_target': 'libcronet_tests', |
| 458 }, | 457 }, |
| 459 'includes': [ '../build/java_apk.gypi' ], | 458 'includes': [ '../build/java_apk.gypi' ], |
| 460 }, | 459 }, |
| 461 { | 460 { |
| 462 # cronet_test_apk creates a .jar as a side effect. Any java targets | 461 # cronet_test_apk creates a .jar as a side effect. Any java targets |
| 463 # that need that .jar in their classpath should depend on this target, | 462 # that need that .jar in their classpath should depend on this target, |
| 464 # cronet_sample_apk_java. Dependents of cronet_test_apk receive its | 463 # cronet_test_apk_java. Dependents of cronet_test_apk receive its |
| 465 # jar path in the variable 'apk_output_jar_path'. This target should | 464 # jar path in the variable 'apk_output_jar_path'. This target should |
| 466 # only be used by targets which instrument cronet_test_apk. | 465 # only be used by targets which instrument cronet_test_apk. |
| 467 'target_name': 'cronet_test_apk_java', | 466 'target_name': 'cronet_test_apk_java', |
| 468 'type': 'none', | 467 'type': 'none', |
| 469 'dependencies': [ | 468 'dependencies': [ |
| 470 'cronet_test_apk', | 469 'cronet_test_apk', |
| 471 ], | 470 ], |
| 472 'includes': [ '../build/apk_fake_jar.gypi' ], | 471 'includes': [ '../build/apk_fake_jar.gypi' ], |
| 473 }, | 472 }, |
| 474 { | 473 { |
| 475 'target_name': 'cronet_test_instrumentation_apk', | 474 'target_name': 'cronet_test_instrumentation_apk', |
| 476 'type': 'none', | 475 'type': 'none', |
| 477 'dependencies': [ | 476 'dependencies': [ |
| 478 'cronet_test_apk_java', | 477 'cronet_test_apk_java', |
| 479 '../base/base.gyp:base_java', | |
| 480 '../base/base.gyp:base_javatests', | |
| 481 '../base/base.gyp:base_java_test_support', | 478 '../base/base.gyp:base_java_test_support', |
| 482 ], | 479 ], |
| 483 'variables': { | 480 'variables': { |
| 484 'apk_name': 'CronetTestInstrumentation', | 481 'apk_name': 'CronetTestInstrumentation', |
| 485 'java_in_dir': 'cronet/android/test/javatests', | 482 'java_in_dir': 'cronet/android/test/javatests', |
| 486 'resource_dir': 'cronet/android/test/res', | 483 'resource_dir': 'cronet/android/test/res', |
| 487 'is_test_apk': 1, | 484 'is_test_apk': 1, |
| 488 }, | 485 }, |
| 489 'includes': [ '../build/java_apk.gypi' ], | 486 'includes': [ '../build/java_apk.gypi' ], |
| 490 }, | 487 }, |
| 491 ], | 488 ], |
| 492 }], # OS=="android" | 489 }], # OS=="android" |
| 493 ], | 490 ], |
| 494 } | 491 } |
| OLD | NEW |