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

Side by Side Diff: content/content_tests.gypi

Issue 1674353004: [Android] Fix generated scripts for junit tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Alphabetized the gyp includes everywhere. Created 4 years, 10 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
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | net/net.gyp » ('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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 { 5 {
6 'variables': { 6 'variables': {
7 'layouttest_support_content_sources': [ 7 'layouttest_support_content_sources': [
8 'public/test/layouttest_support.h', 8 'public/test/layouttest_support.h',
9 'public/test/nested_message_pump_android.cc', 9 'public/test/nested_message_pump_android.cc',
10 'public/test/nested_message_pump_android.h', 10 'public/test/nested_message_pump_android.h',
(...skipping 2165 matching lines...) Expand 10 before | Expand all | Expand 10 after
2176 'content.gyp:content_java', 2176 'content.gyp:content_java',
2177 '../base/base.gyp:base_java', 2177 '../base/base.gyp:base_java',
2178 '../base/base.gyp:base_java_test_support', 2178 '../base/base.gyp:base_java_test_support',
2179 '../testing/android/junit/junit_test.gyp:junit_test_support', 2179 '../testing/android/junit/junit_test.gyp:junit_test_support',
2180 ], 2180 ],
2181 'variables': { 2181 'variables': {
2182 'main_class': 'org.chromium.testing.local.JunitTestMain', 2182 'main_class': 'org.chromium.testing.local.JunitTestMain',
2183 'src_paths': [ 2183 'src_paths': [
2184 'public/android/junit/', 2184 'public/android/junit/',
2185 ], 2185 ],
2186 'test_type': 'junit',
2186 }, 2187 },
2187 'includes': [ 2188 'includes': [
2189 '../build/android/test_runner.gypi',
2188 '../build/host_jar.gypi', 2190 '../build/host_jar.gypi',
2189 ], 2191 ],
2190 }, 2192 },
2191 ], 2193 ],
2192 'conditions': [ 2194 'conditions': [
2193 ['test_isolation_mode != "noop"', 2195 ['test_isolation_mode != "noop"',
2194 { 2196 {
2195 'targets': [ 2197 'targets': [
2196 { 2198 {
2197 'target_name': 'content_browsertests_apk_run', 2199 'target_name': 'content_browsertests_apk_run',
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
2232 'content_unittests_apk.isolate', 2234 'content_unittests_apk.isolate',
2233 ], 2235 ],
2234 }, 2236 },
2235 ], 2237 ],
2236 }, 2238 },
2237 ], 2239 ],
2238 ], 2240 ],
2239 }], 2241 }],
2240 ], 2242 ],
2241 } 2243 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698