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

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

Issue 1493953002: [Android] Add support for timeouts scaling for OnDevice instrumentation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added wrong GN dependency. Created 5 years 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
« no previous file with comments | « testing/android/driver/java/src/org/chromium/test/driver/OnDeviceInstrumentationDriver.java ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 'variables' : { 8 'variables' : {
9 'driver_apk_name': 'OnDeviceInstrumentationDriver', 9 'driver_apk_name': 'OnDeviceInstrumentationDriver',
10 'driver_apk_path': '<(PRODUCT_DIR)/apks/<(driver_apk_name).apk' 10 'driver_apk_path': '<(PRODUCT_DIR)/apks/<(driver_apk_name).apk'
(...skipping 20 matching lines...) Expand all
31 '../../build/java.gypi', 31 '../../build/java.gypi',
32 ], 32 ],
33 }, 33 },
34 { 34 {
35 'target_name': 'driver_apk', 35 'target_name': 'driver_apk',
36 'type': 'none', 36 'type': 'none',
37 'dependencies': [ 37 'dependencies': [
38 'broker_java', 38 'broker_java',
39 'reporter_java', 39 'reporter_java',
40 'appurify_support.gyp:appurify_support_java', 40 'appurify_support.gyp:appurify_support_java',
41 '../../base/base.gyp:base_java_test_support',
41 ], 42 ],
42 'variables': { 43 'variables': {
43 'apk_name': '<(driver_apk_name)', 44 'apk_name': '<(driver_apk_name)',
44 'final_apk_path': '<(driver_apk_path)', 45 'final_apk_path': '<(driver_apk_path)',
45 'java_in_dir': '../../testing/android/driver/java', 46 'java_in_dir': '../../testing/android/driver/java',
46 }, 47 },
47 'includes': [ 48 'includes': [
48 '../../build/java_apk.gypi', 49 '../../build/java_apk.gypi',
49 ], 50 ],
50 }, 51 },
(...skipping 19 matching lines...) Expand all
70 'action': [ 71 'action': [
71 'python', '../../build/android/gyp/touch.py', '<(required_file)' , 72 'python', '../../build/android/gyp/touch.py', '<(required_file)' ,
72 ], 73 ],
73 }, 74 },
74 ], 75 ],
75 }, 76 },
76 ], 77 ],
77 }], 78 }],
78 ], 79 ],
79 } 80 }
OLDNEW
« no previous file with comments | « testing/android/driver/java/src/org/chromium/test/driver/OnDeviceInstrumentationDriver.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698