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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 11363150: Support Java resources within content and chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: don't include R.java files twice in test apks Created 8 years, 1 month 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
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 4932 matching lines...) Expand 10 before | Expand all | Expand 10 after
4943 'chromium_testshell_java', 4943 'chromium_testshell_java',
4944 '../content/content.gyp:content_java_test_support', 4944 '../content/content.gyp:content_java_test_support',
4945 '../tools/android/forwarder/forwarder.gyp:forwarder', 4945 '../tools/android/forwarder/forwarder.gyp:forwarder',
4946 ], 4946 ],
4947 'variables': { 4947 'variables': {
4948 'package_name': 'chromium_testshell_test', 4948 'package_name': 'chromium_testshell_test',
4949 'apk_name': 'ChromiumTestShellTest', 4949 'apk_name': 'ChromiumTestShellTest',
4950 'java_in_dir': './android/testshell/javatests', 4950 'java_in_dir': './android/testshell/javatests',
4951 'resource_dir': '../res', 4951 'resource_dir': '../res',
4952 'additional_src_dirs': ['android/javatests/src'], 4952 'additional_src_dirs': ['android/javatests/src'],
4953 'is_test_apk': 1,
4953 }, 4954 },
4954 'includes': [ '../build/java_apk.gypi' ], 4955 'includes': [ '../build/java_apk.gypi' ],
4955 }, 4956 },
4956 ], 4957 ],
4957 }], 4958 }],
4958 ['test_isolation_mode != "noop"', { 4959 ['test_isolation_mode != "noop"', {
4959 'targets': [ 4960 'targets': [
4960 { 4961 {
4961 'target_name': 'unit_tests_run', 4962 'target_name': 'unit_tests_run',
4962 'type': 'none', 4963 'type': 'none',
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
5003 'sync_integration_tests.isolate', 5004 'sync_integration_tests.isolate',
5004 ], 5005 ],
5005 'sources': [ 5006 'sources': [
5006 'sync_integration_tests.isolate', 5007 'sync_integration_tests.isolate',
5007 ], 5008 ],
5008 }, 5009 },
5009 ], 5010 ],
5010 }], 5011 }],
5011 ], # 'conditions' 5012 ], # 'conditions'
5012 } 5013 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698