| 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 2780 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2791 'chromium_testshell_java', | 2791 'chromium_testshell_java', |
| 2792 '../content/content.gyp:content_java_test_support', | 2792 '../content/content.gyp:content_java_test_support', |
| 2793 '../tools/android/forwarder/forwarder.gyp:forwarder', | 2793 '../tools/android/forwarder/forwarder.gyp:forwarder', |
| 2794 ], | 2794 ], |
| 2795 'variables': { | 2795 'variables': { |
| 2796 'package_name': 'chromium_testshell_test', | 2796 'package_name': 'chromium_testshell_test', |
| 2797 'apk_name': 'ChromiumTestShellTest', | 2797 'apk_name': 'ChromiumTestShellTest', |
| 2798 'java_in_dir': './android/testshell/javatests', | 2798 'java_in_dir': './android/testshell/javatests', |
| 2799 'resource_dir': '../res', | 2799 'resource_dir': '../res', |
| 2800 'additional_src_dirs': ['android/javatests/src'], | 2800 'additional_src_dirs': ['android/javatests/src'], |
| 2801 'is_test_apk': 1, |
| 2801 }, | 2802 }, |
| 2802 'includes': [ '../build/java_apk.gypi' ], | 2803 'includes': [ '../build/java_apk.gypi' ], |
| 2803 }, | 2804 }, |
| 2804 ], | 2805 ], |
| 2805 }], | 2806 }], |
| 2806 ['test_isolation_mode != "noop"', { | 2807 ['test_isolation_mode != "noop"', { |
| 2807 'targets': [ | 2808 'targets': [ |
| 2808 { | 2809 { |
| 2809 'target_name': 'browser_tests_run', | 2810 'target_name': 'browser_tests_run', |
| 2810 'type': 'none', | 2811 'type': 'none', |
| (...skipping 26 matching lines...) Expand all Loading... |
| 2837 'sync_integration_tests.isolate', | 2838 'sync_integration_tests.isolate', |
| 2838 ], | 2839 ], |
| 2839 'sources': [ | 2840 'sources': [ |
| 2840 'sync_integration_tests.isolate', | 2841 'sync_integration_tests.isolate', |
| 2841 ], | 2842 ], |
| 2842 }, | 2843 }, |
| 2843 ], | 2844 ], |
| 2844 }], | 2845 }], |
| 2845 ], # 'conditions' | 2846 ], # 'conditions' |
| 2846 } | 2847 } |
| OLD | NEW |