| 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 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 324 '<(SHARED_LIB_DIR)/<(native_lib)', | 324 '<(SHARED_LIB_DIR)/<(native_lib)', |
| 325 ], | 325 ], |
| 326 }, | 326 }, |
| 327 ], | 327 ], |
| 328 }, | 328 }, |
| 329 { | 329 { |
| 330 'target_name': 'cronet_sample_apk', | 330 'target_name': 'cronet_sample_apk', |
| 331 'type': 'none', | 331 'type': 'none', |
| 332 'dependencies': [ | 332 'dependencies': [ |
| 333 'cronet', | 333 'cronet', |
| 334 'cronet_stub', |
| 334 ], | 335 ], |
| 335 'variables': { | 336 'variables': { |
| 336 'apk_name': 'CronetSample', | 337 'apk_name': 'CronetSample', |
| 337 'java_in_dir': 'cronet/android/sample', | 338 'java_in_dir': 'cronet/android/sample', |
| 338 'resource_dir': 'cronet/android/sample/res', | 339 'resource_dir': 'cronet/android/sample/res', |
| 339 'native_lib_target': 'libcronet', | 340 'native_lib_target': 'libcronet', |
| 341 'proguard_enabled': 'true', |
| 342 'proguard_flags_paths': [ |
| 343 'cronet/android/proguard.cfg', |
| 344 # Proguard config for instrumentation test apk. |
| 345 'cronet/android/sample/javatests/proguard.cfg', |
| 346 ], |
| 340 }, | 347 }, |
| 341 'includes': [ '../build/java_apk.gypi' ], | 348 'includes': [ '../build/java_apk.gypi' ], |
| 342 }, | 349 }, |
| 343 { | 350 { |
| 344 # cronet_sample_apk creates a .jar as a side effect. Any java targets | 351 # cronet_sample_apk creates a .jar as a side effect. Any java targets |
| 345 # that need that .jar in their classpath should depend on this target, | 352 # that need that .jar in their classpath should depend on this target, |
| 346 # cronet_sample_apk_java. Dependents of cronet_sample_apk receive its | 353 # cronet_sample_apk_java. Dependents of cronet_sample_apk receive its |
| 347 # jar path in the variable 'apk_output_jar_path'. This target should | 354 # jar path in the variable 'apk_output_jar_path'. This target should |
| 348 # only be used by targets which instrument cronet_sample_apk. | 355 # only be used by targets which instrument cronet_sample_apk. |
| 349 'target_name': 'cronet_sample_apk_java', | 356 'target_name': 'cronet_sample_apk_java', |
| 350 'type': 'none', | 357 'type': 'none', |
| 351 'dependencies': [ | 358 'dependencies': [ |
| 352 'cronet_sample_apk', | 359 'cronet_sample_apk', |
| 353 ], | 360 ], |
| 354 'includes': [ '../build/apk_fake_jar.gypi' ], | 361 'includes': [ '../build/apk_fake_jar.gypi' ], |
| 355 }, | 362 }, |
| 356 { | 363 { |
| 357 'target_name': 'cronet_sample_test_apk', | 364 'target_name': 'cronet_sample_test_apk', |
| 358 'type': 'none', | 365 'type': 'none', |
| 359 'dependencies': [ | 366 'dependencies': [ |
| 367 'cronet', |
| 360 'cronet_sample_apk_java', | 368 'cronet_sample_apk_java', |
| 369 'cronet_stub', |
| 361 '../base/base.gyp:base_java', | 370 '../base/base.gyp:base_java', |
| 362 '../base/base.gyp:base_javatests', | 371 '../base/base.gyp:base_javatests', |
| 363 '../base/base.gyp:base_java_test_support', | 372 '../base/base.gyp:base_java_test_support', |
| 364 # TODO(mef): Figure out why some tests are failing. | 373 # TODO(mef): Figure out why some tests are failing. |
| 365 #'../net/net.gyp:net_javatests', | 374 #'../net/net.gyp:net_javatests', |
| 366 #'../net/net.gyp:net_java_test_support', | 375 #'../net/net.gyp:net_java_test_support', |
| 367 ], | 376 ], |
| 368 'variables': { | 377 'variables': { |
| 369 'apk_name': 'CronetSampleTest', | 378 'apk_name': 'CronetSampleTest', |
| 370 'java_in_dir': 'cronet/android/sample/javatests', | 379 'java_in_dir': 'cronet/android/sample/javatests', |
| 380 'proguard_enabled': 'true', |
| 371 'resource_dir': 'cronet/android/sample/res', | 381 'resource_dir': 'cronet/android/sample/res', |
| 372 'is_test_apk': 1, | 382 'is_test_apk': 1, |
| 373 }, | 383 }, |
| 374 'includes': [ '../build/java_apk.gypi' ], | 384 'includes': [ '../build/java_apk.gypi' ], |
| 375 }, | 385 }, |
| 376 ], | 386 ], |
| 377 }], # OS=="android" | 387 }], # OS=="android" |
| 378 ], | 388 ], |
| 379 } | 389 } |
| OLD | NEW |