Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

Side by Side Diff: components/cronet.gypi

Issue 612433002: Fix a crash when opening CronetTest app (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | components/cronet/android/test/cronet_test_jni.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 'resource_dir': 'cronet/android/sample/res', 393 'resource_dir': 'cronet/android/sample/res',
394 'is_test_apk': 1, 394 'is_test_apk': 1,
395 }, 395 },
396 'includes': [ '../build/java_apk.gypi' ], 396 'includes': [ '../build/java_apk.gypi' ],
397 }, 397 },
398 { 398 {
399 'target_name': 'cronet_tests_jni_headers', 399 'target_name': 'cronet_tests_jni_headers',
400 'type': 'none', 400 'type': 'none',
401 'sources': [ 401 'sources': [
402 'cronet/android/test/src/org/chromium/cronet_test_apk/CronetTestUtil .java', 402 'cronet/android/test/src/org/chromium/cronet_test_apk/CronetTestUtil .java',
403 'cronet/android/test/javatests/src/org/chromium/cronet_test_apk/Mock UrlRequestJobTest.java', 403 'cronet/android/test/src/org/chromium/cronet_test_apk/MockUrlRequest JobUtil.java',
404 ], 404 ],
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_test_jni.cc', 414 'cronet/android/test/cronet_test_jni.cc',
415 'cronet/android/test/mock_url_request_job_test.cc', 415 'cronet/android/test/mock_url_request_job_util.cc',
416 'cronet/android/test/mock_url_request_job_test.h', 416 'cronet/android/test/mock_url_request_job_util.h',
417 '../net/base/directory_lister.cc', 417 '../net/base/directory_lister.cc',
418 '../net/base/directory_lister.h', 418 '../net/base/directory_lister.h',
419 '../net/url_request/url_request_file_job.cc', 419 '../net/url_request/url_request_file_job.cc',
420 '../net/url_request/url_request_file_job.h', 420 '../net/url_request/url_request_file_job.h',
421 ], 421 ],
422 'dependencies': [ 422 'dependencies': [
423 'cronet_static', 423 'cronet_static',
424 'cronet_tests_jni_headers', 424 'cronet_tests_jni_headers',
425 '../base/base.gyp:base', 425 '../base/base.gyp:base',
426 '../net/net.gyp:net', 426 '../net/net.gyp:net',
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 'java_in_dir': 'cronet/android/test/javatests', 474 'java_in_dir': 'cronet/android/test/javatests',
475 'resource_dir': 'cronet/android/test/res', 475 'resource_dir': 'cronet/android/test/res',
476 'is_test_apk': 1, 476 'is_test_apk': 1,
477 }, 477 },
478 'includes': [ '../build/java_apk.gypi' ], 478 'includes': [ '../build/java_apk.gypi' ],
479 }, 479 },
480 ], 480 ],
481 }], # OS=="android" 481 }], # OS=="android"
482 ], 482 ],
483 } 483 }
OLDNEW
« no previous file with comments | « no previous file | components/cronet/android/test/cronet_test_jni.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698