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

Side by Side Diff: device/device_tests.gyp

Issue 1127043006: GYP dependencies for JNI _java targets moved to device targets that require them. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 }], 85 }],
86 ['OS=="android"', { 86 ['OS=="android"', {
87 'dependencies!': [ 87 'dependencies!': [
88 '../tools/usb_gadget/usb_gadget.gyp:usb_gadget', 88 '../tools/usb_gadget/usb_gadget.gyp:usb_gadget',
89 'usb/usb.gyp:device_usb', 89 'usb/usb.gyp:device_usb',
90 'serial/serial.gyp:device_serial', 90 'serial/serial.gyp:device_serial',
91 'serial/serial.gyp:device_serial_test_util', 91 'serial/serial.gyp:device_serial_test_util',
92 'hid/hid.gyp:device_hid', 92 'hid/hid.gyp:device_hid',
93 ], 93 ],
94 'dependencies': [ 94 'dependencies': [
95 'bluetooth/bluetooth.gyp:device_bluetooth_java',
96 '../testing/android/native_test.gyp:native_test_native_code', 95 '../testing/android/native_test.gyp:native_test_native_code',
97 ], 96 ],
98 'sources/': [ 97 'sources/': [
99 ['exclude', '(^|/)hid'], 98 ['exclude', '(^|/)hid'],
100 ['exclude', '(^|/)serial'], 99 ['exclude', '(^|/)serial'],
101 ['exclude', '(^|/)usb'], 100 ['exclude', '(^|/)usb'],
102 ], 101 ],
103 }], 102 }],
104 ['OS=="mac"', { 103 ['OS=="mac"', {
105 'link_settings': { 104 'link_settings': {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 ], 156 ],
158 'variables': { 157 'variables': {
159 'test_suite_name': 'device_unittests', 158 'test_suite_name': 'device_unittests',
160 }, 159 },
161 'includes': [ '../build/apk_test.gypi' ], 160 'includes': [ '../build/apk_test.gypi' ],
162 }, 161 },
163 ], 162 ],
164 }], 163 }],
165 ], 164 ],
166 } 165 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698