Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Side by Side Diff: testing/android/native_test.gyp

Issue 1186513002: Revert of [Android] Refactor browser test execution. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 { 5 {
6 'conditions': [ 6 'conditions': [
7 ['OS=="android"', { 7 ['OS=="android"', {
8 'targets': [ 8 'targets': [
9 { 9 {
10 # GN: //testing/android:native_test_jni_headers 10 # GN: //testing/android:native_test_jni_headers
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 'dependencies': [ 48 'dependencies': [
49 'native_test_support', 49 'native_test_support',
50 '../../base/base.gyp:base', 50 '../../base/base.gyp:base',
51 ], 51 ],
52 }, 52 },
53 { 53 {
54 'target_name': 'native_test_java', 54 'target_name': 'native_test_java',
55 'type': 'none', 55 'type': 'none',
56 'dependencies': [ 56 'dependencies': [
57 'appurify_support.gyp:appurify_support_java', 57 'appurify_support.gyp:appurify_support_java',
58 'on_device_instrumentation.gyp:reporter_java',
59 '../../base/base.gyp:base_native_libraries_gen', 58 '../../base/base.gyp:base_native_libraries_gen',
60 '../../base/base.gyp:base_java', 59 '../../base/base.gyp:base_java',
61 ], 60 ],
62 'variables': { 61 'variables': {
63 'chromium_code': '1', 62 'chromium_code': '1',
64 'jar_excluded_classes': [ '*/NativeLibraries.class' ], 63 'jar_excluded_classes': [ '*/NativeLibraries.class' ],
65 'java_in_dir': 'native_test/java', 64 'java_in_dir': 'native_test/java',
66 }, 65 },
67 'includes': [ '../../build/java.gypi' ], 66 'includes': [ '../../build/java.gypi' ],
68 }, 67 },
69 ], 68 ],
70 }] 69 }]
71 ], 70 ],
72 } 71 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698