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

Side by Side Diff: device/bluetooth/bluetooth.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 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 '../../build/linux/system.gyp:dbus', 120 '../../build/linux/system.gyp:dbus',
121 '../../chromeos/chromeos.gyp:chromeos', 121 '../../chromeos/chromeos.gyp:chromeos',
122 '../../dbus/dbus.gyp:dbus', 122 '../../dbus/dbus.gyp:dbus',
123 ], 123 ],
124 'export_dependent_settings': [ 124 'export_dependent_settings': [
125 '../../build/linux/system.gyp:dbus' 125 '../../build/linux/system.gyp:dbus'
126 ] 126 ]
127 }], 127 }],
128 ['OS == "android"', { 128 ['OS == "android"', {
129 'dependencies': [ 129 'dependencies': [
130 'device_bluetooth_java',
130 'device_bluetooth_jni_headers', 131 'device_bluetooth_jni_headers',
131 ], 132 ],
132 'sources': [ 133 'sources': [
133 'android/bluetooth_jni_registrar.cc', 134 'android/bluetooth_jni_registrar.cc',
134 'android/bluetooth_jni_registrar.h', 135 'android/bluetooth_jni_registrar.h',
135 ], 136 ],
136 }], 137 }],
137 ['OS=="win"', { 138 ['OS=="win"', {
138 # The following two blocks are duplicated. They apply to static lib 139 # The following two blocks are duplicated. They apply to static lib
139 # and shared lib configurations respectively. 140 # and shared lib configurations respectively.
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 ], 253 ],
253 'variables': { 254 'variables': {
254 'java_in_dir': '../../device/bluetooth/android/java', 255 'java_in_dir': '../../device/bluetooth/android/java',
255 }, 256 },
256 'includes': [ '../../build/java.gypi' ], 257 'includes': [ '../../build/java.gypi' ],
257 }, 258 },
258 ], 259 ],
259 }], 260 }],
260 ], 261 ],
261 } 262 }
OLDNEW
« content/content.gyp ('K') | « device/battery/battery.gyp ('k') | device/device_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698