| 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 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 343 '<(SHARED_LIB_DIR)/<(native_lib)', | 343 '<(SHARED_LIB_DIR)/<(native_lib)', |
| 344 ], | 344 ], |
| 345 }, | 345 }, |
| 346 ], | 346 ], |
| 347 }, | 347 }, |
| 348 { | 348 { |
| 349 'target_name': 'cronet_sample_apk', | 349 'target_name': 'cronet_sample_apk', |
| 350 'type': 'none', | 350 'type': 'none', |
| 351 'dependencies': [ | 351 'dependencies': [ |
| 352 'cronet', | 352 'cronet', |
| 353 'cronet_stub', |
| 353 ], | 354 ], |
| 354 'variables': { | 355 'variables': { |
| 355 'apk_name': 'CronetSample', | 356 'apk_name': 'CronetSample', |
| 356 'java_in_dir': 'cronet/android/sample', | 357 'java_in_dir': 'cronet/android/sample', |
| 357 'resource_dir': 'cronet/android/sample/res', | 358 'resource_dir': 'cronet/android/sample/res', |
| 358 'native_lib_target': 'libcronet', | 359 'native_lib_target': 'libcronet', |
| 360 'proguard_enabled': 'true', |
| 361 'proguard_flags_paths': [ |
| 362 'cronet/android/proguard.cfg', |
| 363 'cronet/android/sample/javatests/proguard.cfg', |
| 364 ], |
| 359 }, | 365 }, |
| 360 'includes': [ '../build/java_apk.gypi' ], | 366 'includes': [ '../build/java_apk.gypi' ], |
| 361 }, | 367 }, |
| 362 { | 368 { |
| 363 # cronet_sample_apk creates a .jar as a side effect. Any java targets | 369 # cronet_sample_apk creates a .jar as a side effect. Any java targets |
| 364 # that need that .jar in their classpath should depend on this target, | 370 # that need that .jar in their classpath should depend on this target, |
| 365 # cronet_sample_apk_java. Dependents of cronet_sample_apk receive its | 371 # cronet_sample_apk_java. Dependents of cronet_sample_apk receive its |
| 366 # jar path in the variable 'apk_output_jar_path'. This target should | 372 # jar path in the variable 'apk_output_jar_path'. This target should |
| 367 # only be used by targets which instrument cronet_sample_apk. | 373 # only be used by targets which instrument cronet_sample_apk. |
| 368 'target_name': 'cronet_sample_apk_java', | 374 'target_name': 'cronet_sample_apk_java', |
| 369 'type': 'none', | 375 'type': 'none', |
| 370 'dependencies': [ | 376 'dependencies': [ |
| 371 'cronet_sample_apk', | 377 'cronet_sample_apk', |
| 372 ], | 378 ], |
| 373 'includes': [ '../build/apk_fake_jar.gypi' ], | 379 'includes': [ '../build/apk_fake_jar.gypi' ], |
| 374 }, | 380 }, |
| 375 { | 381 { |
| 376 'target_name': 'cronet_sample_test_apk', | 382 'target_name': 'cronet_sample_test_apk', |
| 377 'type': 'none', | 383 'type': 'none', |
| 378 'dependencies': [ | 384 'dependencies': [ |
| 385 'cronet', |
| 379 'cronet_sample_apk_java', | 386 'cronet_sample_apk_java', |
| 387 'cronet_stub', |
| 380 '../base/base.gyp:base_java', | 388 '../base/base.gyp:base_java', |
| 381 '../base/base.gyp:base_javatests', | |
| 382 '../base/base.gyp:base_java_test_support', | 389 '../base/base.gyp:base_java_test_support', |
| 383 # TODO(mef): Figure out why some tests are failing. | |
| 384 #'../net/net.gyp:net_javatests', | |
| 385 #'../net/net.gyp:net_java_test_support', | |
| 386 ], | 390 ], |
| 387 'variables': { | 391 'variables': { |
| 388 'apk_name': 'CronetSampleTest', | 392 'apk_name': 'CronetSampleTest', |
| 389 'java_in_dir': 'cronet/android/sample/javatests', | 393 'java_in_dir': 'cronet/android/sample/javatests', |
| 390 'resource_dir': 'cronet/android/sample/res', | 394 'resource_dir': 'cronet/android/sample/res', |
| 391 'is_test_apk': 1, | 395 'is_test_apk': 1, |
| 392 }, | 396 }, |
| 393 'includes': [ '../build/java_apk.gypi' ], | 397 'includes': [ '../build/java_apk.gypi' ], |
| 394 }, | 398 }, |
| 395 { | 399 { |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 459 'java_in_dir': 'cronet/android/test/javatests', | 463 'java_in_dir': 'cronet/android/test/javatests', |
| 460 'resource_dir': 'cronet/android/test/res', | 464 'resource_dir': 'cronet/android/test/res', |
| 461 'is_test_apk': 1, | 465 'is_test_apk': 1, |
| 462 }, | 466 }, |
| 463 'includes': [ '../build/java_apk.gypi' ], | 467 'includes': [ '../build/java_apk.gypi' ], |
| 464 }, | 468 }, |
| 465 ], | 469 ], |
| 466 }], # OS=="android" | 470 }], # OS=="android" |
| 467 ], | 471 ], |
| 468 } | 472 } |
| OLD | NEW |