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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 10987083: Add more generic support for java targets bundling multiple directories (Closed) Base URL: http://git.chromium.org/chromium/src.git@apk_jar
Patch Set: Created 8 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
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 4772 matching lines...) Expand 10 before | Expand all | Expand 10 after
4783 '../base/base.gyp:base_java_test_support', 4783 '../base/base.gyp:base_java_test_support',
4784 'chrome_java', 4784 'chrome_java',
4785 'chromium_testshell_java', 4785 'chromium_testshell_java',
4786 '../tools/android/forwarder/forwarder.gyp:forwarder', 4786 '../tools/android/forwarder/forwarder.gyp:forwarder',
4787 ], 4787 ],
4788 'variables': { 4788 'variables': {
4789 'package_name': 'chromium_testshell_test', 4789 'package_name': 'chromium_testshell_test',
4790 'apk_name': 'ChromiumTestShellTest', 4790 'apk_name': 'ChromiumTestShellTest',
4791 'java_in_dir': './android/testshell/javatests', 4791 'java_in_dir': './android/testshell/javatests',
4792 'resource_dir': '../res', 4792 'resource_dir': '../res',
4793 'additional_input_paths': ['<!@(find android/javatests/src -name "*. java")', ], 4793 'additional_src_dirs': ['android/javatests/src'],
4794 }, 4794 },
4795 'includes': [ '../build/java_apk.gypi' ], 4795 'includes': [ '../build/java_apk.gypi' ],
4796 }, 4796 },
4797 ], 4797 ],
4798 }], 4798 }],
4799 ['test_isolation_mode != "noop"', { 4799 ['test_isolation_mode != "noop"', {
4800 'targets': [ 4800 'targets': [
4801 { 4801 {
4802 'target_name': 'unit_tests_run', 4802 'target_name': 'unit_tests_run',
4803 'type': 'none', 4803 'type': 'none',
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
4857 '--result', '<@(_outputs)', 4857 '--result', '<@(_outputs)',
4858 '--isolate', 'browser_tests.isolate', 4858 '--isolate', 'browser_tests.isolate',
4859 ], 4859 ],
4860 }, 4860 },
4861 ], 4861 ],
4862 }, 4862 },
4863 ], 4863 ],
4864 }], 4864 }],
4865 ], # 'conditions' 4865 ], # 'conditions'
4866 } 4866 }
OLDNEW
« no previous file with comments | « chrome/android/testshell/javatests/chromium_testshell_test_apk.xml ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698