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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 10827134: Include chromium_net.jar in unit_tests_apk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved to chrome_test_suite.cc Created 8 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/test/base/chrome_test_suite.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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'variables' : { 5 'variables' : {
6 'pyautolib_sources': [ 6 'pyautolib_sources': [
7 'app/chrome_command_ids.h', 7 'app/chrome_command_ids.h',
8 'app/chrome_dll_resource.h', 8 'app/chrome_dll_resource.h',
9 'common/automation_constants.h', 9 'common/automation_constants.h',
10 'common/pref_names.cc', 10 'common/pref_names.cc',
(...skipping 4566 matching lines...) Expand 10 before | Expand all | Expand 10 after
4577 }], # 'coverage!=0' 4577 }], # 'coverage!=0'
4578 # Special target to wrap a gtest_target_type==shared_library 4578 # Special target to wrap a gtest_target_type==shared_library
4579 # unit_tests into an android apk for execution. 4579 # unit_tests into an android apk for execution.
4580 ['OS == "android" and gtest_target_type == "shared_library"', { 4580 ['OS == "android" and gtest_target_type == "shared_library"', {
4581 'targets': [ 4581 'targets': [
4582 { 4582 {
4583 'target_name': 'unit_tests_apk', 4583 'target_name': 'unit_tests_apk',
4584 'type': 'none', 4584 'type': 'none',
4585 'dependencies': [ 4585 'dependencies': [
4586 '../base/base.gyp:base_java', 4586 '../base/base.gyp:base_java',
4587 '../net/net.gyp:net_java',
4587 'unit_tests', 4588 'unit_tests',
4588 ], 4589 ],
4589 'variables': { 4590 'variables': {
4590 'test_suite_name': 'unit_tests', 4591 'test_suite_name': 'unit_tests',
4591 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)unit_test s<(SHARED_LIB_SUFFIX)', 4592 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)unit_test s<(SHARED_LIB_SUFFIX)',
4592 'input_jars_paths': [ 4593 'input_jars_paths': [
4593 '<(PRODUCT_DIR)/lib.java/chromium_base.jar', 4594 '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
4595 '<(PRODUCT_DIR)/lib.java/chromium_net.jar',
4594 ], 4596 ],
4595 }, 4597 },
4596 'includes': [ '../build/apk_test.gypi' ], 4598 'includes': [ '../build/apk_test.gypi' ],
4597 }, 4599 },
4598 ], 4600 ],
4599 }], 4601 }],
4600 ['test_isolation_mode != "noop"', { 4602 ['test_isolation_mode != "noop"', {
4601 'targets': [ 4603 'targets': [
4602 { 4604 {
4603 'target_name': 'unit_tests_run', 4605 'target_name': 'unit_tests_run',
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
4658 '--result', '<@(_outputs)', 4660 '--result', '<@(_outputs)',
4659 '--isolate', 'browser_tests.isolate', 4661 '--isolate', 'browser_tests.isolate',
4660 ], 4662 ],
4661 }, 4663 },
4662 ], 4664 ],
4663 }, 4665 },
4664 ], 4666 ],
4665 }], 4667 }],
4666 ], # 'conditions' 4668 ], # 'conditions'
4667 } 4669 }
OLDNEW
« no previous file with comments | « no previous file | chrome/test/base/chrome_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698