Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 3207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3218 ], | 3218 ], |
| 3219 'variables': { | 3219 'variables': { |
| 3220 'apk_name': 'ChromiumTestShellTest', | 3220 'apk_name': 'ChromiumTestShellTest', |
| 3221 'java_in_dir': 'android/testshell/javatests', | 3221 'java_in_dir': 'android/testshell/javatests', |
| 3222 'resource_dir': 'android/testshell/res', | 3222 'resource_dir': 'android/testshell/res', |
| 3223 'additional_src_dirs': ['android/javatests/src'], | 3223 'additional_src_dirs': ['android/javatests/src'], |
| 3224 'is_test_apk': 1, | 3224 'is_test_apk': 1, |
| 3225 }, | 3225 }, |
| 3226 'includes': [ '../build/java_apk.gypi' ], | 3226 'includes': [ '../build/java_apk.gypi' ], |
| 3227 }, | 3227 }, |
| 3228 { | |
| 3229 'target_name': 'chromium_testshell_uiautomator_tests_java', | |
| 3230 'type': 'none', | |
| 3231 'variables': { | |
| 3232 'java_in_dir': 'android/uiautomator_tests', | |
| 3233 'input_jars_paths': [ '<(android_sdk)/uiautomator.jar' ], | |
|
cjhopman
2013/04/17 20:28:35
Targets shouldn't add jars directly to input_jars_
frankf
2013/04/19 18:06:37
Done.
On 2013/04/17 20:28:35, cjhopman wrote:
| |
| 3234 }, | |
| 3235 'dependencies': [ | |
| 3236 '../base/base.gyp:base_java_test_support', | |
| 3237 ], | |
| 3238 'includes': [ '../build/java.gypi' ], | |
| 3239 }, | |
| 3240 { | |
| 3241 'target_name': 'chromium_testshell_uiautomator_tests', | |
| 3242 'type': 'none', | |
| 3243 'dependencies': [ | |
| 3244 'chromium_testshell_uiautomator_tests_java', | |
| 3245 ], | |
| 3246 'includes': [ '../build/uiautomator_test.gypi' ], | |
| 3247 }, | |
| 3228 ], | 3248 ], |
| 3229 }], | 3249 }], |
| 3230 ['test_isolation_mode != "noop"', { | 3250 ['test_isolation_mode != "noop"', { |
| 3231 'targets': [ | 3251 'targets': [ |
| 3232 { | 3252 { |
| 3233 'target_name': 'browser_tests_run', | 3253 'target_name': 'browser_tests_run', |
| 3234 'type': 'none', | 3254 'type': 'none', |
| 3235 'dependencies': [ | 3255 'dependencies': [ |
| 3236 'browser_tests', | 3256 'browser_tests', |
| 3237 'chrome', | 3257 'chrome', |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3318 # more details. | 3338 # more details. |
| 3319 'DebugInformationFormat': '3', | 3339 'DebugInformationFormat': '3', |
| 3320 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/browser_tests.exe.pdb', | 3340 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/browser_tests.exe.pdb', |
| 3321 }, | 3341 }, |
| 3322 }, | 3342 }, |
| 3323 }, | 3343 }, |
| 3324 ], | 3344 ], |
| 3325 }], | 3345 }], |
| 3326 ], # 'conditions' | 3346 ], # 'conditions' |
| 3327 } | 3347 } |
| OLD | NEW |