| 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 'chrome_browser_extensions_test_support_sources': [ | 6 'chrome_browser_extensions_test_support_sources': [ |
| 7 # A list of sources which is shared between different browser tests. | 7 # A list of sources which is shared between different browser tests. |
| 8 'browser/apps/app_browsertest_util.cc', | 8 'browser/apps/app_browsertest_util.cc', |
| 9 'browser/apps/app_browsertest_util.h', | 9 'browser/apps/app_browsertest_util.h', |
| 10 'browser/extensions/browsertest_util.cc', | 10 'browser/extensions/browsertest_util.cc', |
| (...skipping 2996 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3007 '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', | 3007 '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', |
| 3008 ], | 3008 ], |
| 3009 }], | 3009 }], |
| 3010 ], | 3010 ], |
| 3011 }, # target 'load_library_perf_tests' | 3011 }, # target 'load_library_perf_tests' |
| 3012 ], | 3012 ], |
| 3013 'conditions': [ | 3013 'conditions': [ |
| 3014 ['OS == "android"', { | 3014 ['OS == "android"', { |
| 3015 'targets': [ | 3015 'targets': [ |
| 3016 { | 3016 { |
| 3017 # GN: //chrome/android:chrome_shell_test_apk | |
| 3018 'target_name': 'chrome_shell_test_apk', | |
| 3019 'type': 'none', | |
| 3020 'dependencies': [ | |
| 3021 'chrome_java', | |
| 3022 'chrome_shell_apk_java', | |
| 3023 'chrome_java_test_support', | |
| 3024 '../base/base.gyp:base', | |
| 3025 '../base/base.gyp:base_java_test_support', | |
| 3026 '../content/content_shell_and_tests.gyp:content_java_test_support', | |
| 3027 '../testing/android/on_device_instrumentation.gyp:broker_java', | |
| 3028 '../testing/android/on_device_instrumentation.gyp:require_driver_apk
', | |
| 3029 ], | |
| 3030 'variables': { | |
| 3031 'apk_name': 'ChromeShellTest', | |
| 3032 'java_in_dir': 'android/shell/javatests', | |
| 3033 'additional_src_dirs': ['android/javatests_shell/src'], | |
| 3034 'is_test_apk': 1, | |
| 3035 'test_type': 'instrumentation', | |
| 3036 'isolate_file': 'chrome_shell_test_apk.isolate', | |
| 3037 }, | |
| 3038 'includes': [ | |
| 3039 '../build/java_apk.gypi', | |
| 3040 '../build/android/test_runner.gypi', | |
| 3041 ], | |
| 3042 }, | |
| 3043 { | |
| 3044 # GN: //chrome/android:chrome_junit_tests | 3017 # GN: //chrome/android:chrome_junit_tests |
| 3045 'target_name': 'chrome_junit_tests', | 3018 'target_name': 'chrome_junit_tests', |
| 3046 'type': 'none', | 3019 'type': 'none', |
| 3047 'dependencies': [ | 3020 'dependencies': [ |
| 3048 'chrome_java', | 3021 'chrome_java', |
| 3049 '../base/base.gyp:base', | 3022 '../base/base.gyp:base', |
| 3050 '../base/base.gyp:base_java_test_support', | 3023 '../base/base.gyp:base_java_test_support', |
| 3051 '../base/base.gyp:base_junit_test_support', | 3024 '../base/base.gyp:base_junit_test_support', |
| 3052 '../sync/sync.gyp:sync_java_test_support', | 3025 '../sync/sync.gyp:sync_java_test_support', |
| 3053 '../testing/android/junit/junit_test.gyp:junit_test_support', | 3026 '../testing/android/junit/junit_test.gyp:junit_test_support', |
| (...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3364 'utility', | 3337 'utility', |
| 3365 ], | 3338 ], |
| 3366 'sources': [ | 3339 'sources': [ |
| 3367 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', | 3340 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', |
| 3368 'tools/service_discovery_sniffer/service_discovery_sniffer.h', | 3341 'tools/service_discovery_sniffer/service_discovery_sniffer.h', |
| 3369 ], | 3342 ], |
| 3370 }] | 3343 }] |
| 3371 }], | 3344 }], |
| 3372 ], # 'conditions' | 3345 ], # 'conditions' |
| 3373 } | 3346 } |
| OLD | NEW |