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

Side by Side Diff: ui/android/ui_android.gyp

Issue 1674353004: [Android] Fix generated scripts for junit tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« build/config/android/internal_rules.gni ('K') | « net/net.gyp ('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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 'ui_java', 174 'ui_java',
175 '../../base/base.gyp:base', 175 '../../base/base.gyp:base',
176 '../../base/base.gyp:base_junit_test_support', 176 '../../base/base.gyp:base_junit_test_support',
177 '../../testing/android/junit/junit_test.gyp:junit_test_support', 177 '../../testing/android/junit/junit_test.gyp:junit_test_support',
178 ], 178 ],
179 'variables': { 179 'variables': {
180 'main_class': 'org.chromium.testing.local.JunitTestMain', 180 'main_class': 'org.chromium.testing.local.JunitTestMain',
181 'src_paths': [ 181 'src_paths': [
182 'junit/', 182 'junit/',
183 ], 183 ],
184 'test_suite_name': 'ui_junit_tests',
185 'test_type': 'junit',
184 }, 186 },
185 'includes': [ 187 'includes': [
186 '../../build/host_jar.gypi', 188 '../../build/host_jar.gypi',
189 '../../build/android/test_runner.gypi',
187 ], 190 ],
188 }, 191 },
189 { 192 {
190 # GN version: //ui/android:ui_android_unittests 193 # GN version: //ui/android:ui_android_unittests
191 'target_name': 'ui_android_unittests', 194 'target_name': 'ui_android_unittests',
192 'type': '<(gtest_target_type)', 195 'type': '<(gtest_target_type)',
193 'dependencies': [ 196 'dependencies': [
194 '../../base/base.gyp:base', 197 '../../base/base.gyp:base',
195 '../../base/base.gyp:test_support_base', 198 '../../base/base.gyp:test_support_base',
196 '../../cc/cc.gyp:cc', 199 '../../cc/cc.gyp:cc',
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 ], 241 ],
239 'sources': [ 242 'sources': [
240 'ui_android_unittests_apk.isolate', 243 'ui_android_unittests_apk.isolate',
241 ], 244 ],
242 }, 245 },
243 ] 246 ]
244 } 247 }
245 ], 248 ],
246 ] 249 ]
247 } 250 }
OLDNEW
« build/config/android/internal_rules.gni ('K') | « net/net.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698