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

Side by Side Diff: chrome/android/chrome_apk.gyp

Issue 1214713003: Move InstrumentationTestCase tests from ChromeShell to ChromePublic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: moved IntentSavingContext to chrome/test to fix ChromeShell compile Created 5 years, 5 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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 'includes': [ 5 'includes': [
6 '../../chrome/chrome_android_paks.gypi', # Included for the list of pak reso urces. 6 '../../chrome/chrome_android_paks.gypi', # Included for the list of pak reso urces.
7 '../../build/util/version.gypi' 7 '../../build/util/version.gypi'
8 ], 8 ],
9 'variables': { 9 'variables': {
10 'chromium_code': 1, 10 'chromium_code': 1,
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 'target_name': 'chrome_shared_test_java', 162 'target_name': 'chrome_shared_test_java',
163 'type': 'none', 163 'type': 'none',
164 'variables': { 164 'variables': {
165 'java_in_dir': 'javatests', 165 'java_in_dir': 'javatests',
166 }, 166 },
167 'dependencies': [ 167 'dependencies': [
168 '../../base/base.gyp:base_java', 168 '../../base/base.gyp:base_java',
169 '../../base/base.gyp:base_java_test_support', 169 '../../base/base.gyp:base_java_test_support',
170 '../../chrome/chrome.gyp:chrome_java', 170 '../../chrome/chrome.gyp:chrome_java',
171 '../../chrome/chrome.gyp:chrome_java_test_support', 171 '../../chrome/chrome.gyp:chrome_java_test_support',
172 '../../components/components.gyp:invalidation_javatests',
173 '../../components/components.gyp:precache_javatests',
172 '../../components/components.gyp:web_contents_delegate_android_java', 174 '../../components/components.gyp:web_contents_delegate_android_java',
173 '../../content/content_shell_and_tests.gyp:content_java_test_support', 175 '../../content/content_shell_and_tests.gyp:content_java_test_support',
174 '../../net/net.gyp:net_java', 176 '../../net/net.gyp:net_java',
175 '../../net/net.gyp:net_java_test_support', 177 '../../net/net.gyp:net_java_test_support',
176 '../../sync/sync.gyp:sync_java_test_support', 178 '../../sync/sync.gyp:sync_java_test_support',
177 '../../third_party/android_tools/android_tools.gyp:android_support_v7_ap pcompat_javalib', 179 '../../third_party/android_tools/android_tools.gyp:android_support_v7_ap pcompat_javalib',
178 ], 180 ],
179 'includes': [ '../../build/java.gypi' ], 181 'includes': [ '../../build/java.gypi' ],
180 }, 182 },
181 { 183 {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 ], 219 ],
218 }, 220 },
219 ], 221 ],
220 } 222 }
221 223
222 # Local Variables: 224 # Local Variables:
223 # tab-width:2 225 # tab-width:2
224 # indent-tabs-mode:nil 226 # indent-tabs-mode:nil
225 # End: 227 # End:
226 # vim: set expandtab tabstop=2 shiftwidth=2: 228 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/android/java/src/org/chromium/chrome/browser/UrlUtilities.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698