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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 186843002: Move ChromeShell files from chrome/android/testshell to chrome/android/shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 9 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 | « chrome/chrome_android.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 2963 matching lines...) Expand 10 before | Expand all | Expand 10 after
2974 'chrome_java', 2974 'chrome_java',
2975 'chromium_testshell_java', 2975 'chromium_testshell_java',
2976 'chrome_java_test_support', 2976 'chrome_java_test_support',
2977 '../base/base.gyp:base', 2977 '../base/base.gyp:base',
2978 '../base/base.gyp:base_java_test_support', 2978 '../base/base.gyp:base_java_test_support',
2979 '../content/content_shell_and_tests.gyp:content_java_test_support', 2979 '../content/content_shell_and_tests.gyp:content_java_test_support',
2980 '../sync/sync.gyp:sync_javatests', 2980 '../sync/sync.gyp:sync_javatests',
2981 ], 2981 ],
2982 'variables': { 2982 'variables': {
2983 'apk_name': 'ChromiumTestShellTest', 2983 'apk_name': 'ChromiumTestShellTest',
2984 'java_in_dir': 'android/testshell/javatests', 2984 'java_in_dir': 'android/shell/javatests',
2985 'resource_dir': 'android/shell/res', 2985 'resource_dir': 'android/shell/res',
2986 'additional_src_dirs': ['android/javatests/src'], 2986 'additional_src_dirs': ['android/javatests/src'],
2987 'is_test_apk': 1, 2987 'is_test_apk': 1,
2988 }, 2988 },
2989 'includes': [ '../build/java_apk.gypi' ], 2989 'includes': [ '../build/java_apk.gypi' ],
2990 }, 2990 },
2991 { 2991 {
2992 'target_name': 'chromedriver_webview_shell_apk', 2992 'target_name': 'chromedriver_webview_shell_apk',
2993 'type': 'none', 2993 'type': 'none',
2994 'variables': { 2994 'variables': {
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
3213 'utility', 3213 'utility',
3214 ], 3214 ],
3215 'sources': [ 3215 'sources': [
3216 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3216 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3217 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3217 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3218 ], 3218 ],
3219 }] 3219 }]
3220 }], 3220 }],
3221 ], # 'conditions' 3221 ], # 'conditions'
3222 } 3222 }
OLDNEW
« no previous file with comments | « chrome/chrome_android.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698