| OLD | NEW |
| 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 2083 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2094 '../testing/android/on_device_instrumentation.gyp:broker_java', | 2094 '../testing/android/on_device_instrumentation.gyp:broker_java', |
| 2095 '../testing/android/on_device_instrumentation.gyp:require_driver_apk
', | 2095 '../testing/android/on_device_instrumentation.gyp:require_driver_apk
', |
| 2096 ], | 2096 ], |
| 2097 'variables': { | 2097 'variables': { |
| 2098 'apk_name': 'ContentShellTest', | 2098 'apk_name': 'ContentShellTest', |
| 2099 'java_in_dir': 'shell/android/javatests', | 2099 'java_in_dir': 'shell/android/javatests', |
| 2100 'resource_dir': 'shell/android/shell_apk/res', | 2100 'resource_dir': 'shell/android/shell_apk/res', |
| 2101 'additional_src_dirs': ['public/android/javatests/', ], | 2101 'additional_src_dirs': ['public/android/javatests/', ], |
| 2102 'is_test_apk': 1, | 2102 'is_test_apk': 1, |
| 2103 'test_type': 'instrumentation', | 2103 'test_type': 'instrumentation', |
| 2104 'isolate_file': 'content_shell_test_apk.isolate', | 2104 'isolate_file': 'content_shell_test_data.isolate', |
| 2105 }, | 2105 }, |
| 2106 'includes': [ | 2106 'includes': [ |
| 2107 '../build/java_apk.gypi', | 2107 '../build/java_apk.gypi', |
| 2108 '../build/android/test_runner.gypi', | 2108 '../build/android/test_runner.gypi', |
| 2109 ], | 2109 ], |
| 2110 }, | 2110 }, |
| 2111 { | 2111 { |
| 2112 # GN: //content/public/android:content_junit_tests | 2112 # GN: //content/public/android:content_junit_tests |
| 2113 'target_name': 'content_junit_tests', | 2113 'target_name': 'content_junit_tests', |
| 2114 'type': 'none', | 2114 'type': 'none', |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2152 { | 2152 { |
| 2153 'target_name': 'content_shell_test_apk_run', | 2153 'target_name': 'content_shell_test_apk_run', |
| 2154 'type': 'none', | 2154 'type': 'none', |
| 2155 'dependencies': [ | 2155 'dependencies': [ |
| 2156 'content_shell_test_apk', | 2156 'content_shell_test_apk', |
| 2157 ], | 2157 ], |
| 2158 'includes': [ | 2158 'includes': [ |
| 2159 '../build/isolate.gypi', | 2159 '../build/isolate.gypi', |
| 2160 ], | 2160 ], |
| 2161 'sources': [ | 2161 'sources': [ |
| 2162 'content_shell_test_apk_run.isolate', | 2162 'content_shell_test_apk.isolate', |
| 2163 ], | 2163 ], |
| 2164 }, | 2164 }, |
| 2165 { | 2165 { |
| 2166 'target_name': 'content_unittests_apk_run', | 2166 'target_name': 'content_unittests_apk_run', |
| 2167 'type': 'none', | 2167 'type': 'none', |
| 2168 'dependencies': [ | 2168 'dependencies': [ |
| 2169 'content_unittests_apk', | 2169 'content_unittests_apk', |
| 2170 ], | 2170 ], |
| 2171 'includes': [ | 2171 'includes': [ |
| 2172 '../build/isolate.gypi', | 2172 '../build/isolate.gypi', |
| 2173 ], | 2173 ], |
| 2174 'sources': [ | 2174 'sources': [ |
| 2175 'content_unittests_apk.isolate', | 2175 'content_unittests_apk.isolate', |
| 2176 ], | 2176 ], |
| 2177 }, | 2177 }, |
| 2178 ], | 2178 ], |
| 2179 }, | 2179 }, |
| 2180 ], | 2180 ], |
| 2181 ], | 2181 ], |
| 2182 }], | 2182 }], |
| 2183 ], | 2183 ], |
| 2184 } | 2184 } |
| OLD | NEW |