Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 2789 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2800 ], # 'actions' | 2800 ], # 'actions' |
| 2801 }, | 2801 }, |
| 2802 ] | 2802 ] |
| 2803 }], # 'coverage!=0' | 2803 }], # 'coverage!=0' |
| 2804 ['OS == "android"', { | 2804 ['OS == "android"', { |
| 2805 'targets': [ | 2805 'targets': [ |
| 2806 { | 2806 { |
| 2807 'target_name': 'chromium_testshell_test_apk', | 2807 'target_name': 'chromium_testshell_test_apk', |
| 2808 'type': 'none', | 2808 'type': 'none', |
| 2809 'dependencies': [ | 2809 'dependencies': [ |
| 2810 'chrome_java', | |
| 2811 'chromium_testshell_java', | |
| 2810 '../base/base.gyp:base', | 2812 '../base/base.gyp:base', |
| 2811 '../base/base.gyp:base_java_test_support', | 2813 '../base/base.gyp:base_java_test_support', |
| 2812 'chrome_java', | |
| 2813 'chromium_testshell_java', | |
| 2814 '../content/content.gyp:content_java_test_support', | 2814 '../content/content.gyp:content_java_test_support', |
| 2815 '../sync/sync.gyp:sync_javatests', | |
|
Yaron
2013/01/10 19:29:40
It seems odd to have sync_javatests roll up into t
nyquist
2013/01/10 22:01:42
Added it to chrome_java now.
| |
| 2815 '../tools/android/forwarder/forwarder.gyp:forwarder', | 2816 '../tools/android/forwarder/forwarder.gyp:forwarder', |
| 2816 ], | 2817 ], |
| 2817 'variables': { | 2818 'variables': { |
| 2818 'package_name': 'chromium_testshell_test', | 2819 'package_name': 'chromium_testshell_test', |
| 2819 'apk_name': 'ChromiumTestShellTest', | 2820 'apk_name': 'ChromiumTestShellTest', |
| 2820 'java_in_dir': './android/testshell/javatests', | 2821 'java_in_dir': './android/testshell/javatests', |
| 2821 'resource_dir': '../res', | 2822 'resource_dir': '../res', |
| 2822 'additional_src_dirs': ['android/javatests/src'], | 2823 'additional_src_dirs': ['android/javatests/src'], |
| 2823 'is_test_apk': 1, | 2824 'is_test_apk': 1, |
| 2824 }, | 2825 }, |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2862 'sync_integration_tests.isolate', | 2863 'sync_integration_tests.isolate', |
| 2863 ], | 2864 ], |
| 2864 'sources': [ | 2865 'sources': [ |
| 2865 'sync_integration_tests.isolate', | 2866 'sync_integration_tests.isolate', |
| 2866 ], | 2867 ], |
| 2867 }, | 2868 }, |
| 2868 ], | 2869 ], |
| 2869 }], | 2870 }], |
| 2870 ], # 'conditions' | 2871 ], # 'conditions' |
| 2871 } | 2872 } |
| OLD | NEW |