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

Side by Side Diff: device/bluetooth/bluetooth.gyp

Issue 1119113002: bluetooth: Initial JNI setup for device/bluetooth. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Additional comment on RegisterBluetoothJni 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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 ['chromeos==1', { 118 ['chromeos==1', {
119 'dependencies': [ 119 'dependencies': [
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"', {
129 'dependencies': [
130 'device_bluetooth_jni_headers',
131 ],
132 'sources': [
133 'android/bluetooth_jni_registrar.cc',
134 'android/bluetooth_jni_registrar.h',
135 ],
136 }],
128 ['OS=="win"', { 137 ['OS=="win"', {
129 # The following two blocks are duplicated. They apply to static lib 138 # The following two blocks are duplicated. They apply to static lib
130 # and shared lib configurations respectively. 139 # and shared lib configurations respectively.
131 'all_dependent_settings': { # For static lib, apply to dependents. 140 'all_dependent_settings': { # For static lib, apply to dependents.
132 'msvs_settings': { 141 'msvs_settings': {
133 'VCLinkerTool': { 142 'VCLinkerTool': {
134 'DelayLoadDLLs': [ 143 'DelayLoadDLLs': [
135 'BluetoothApis.dll', 144 'BluetoothApis.dll',
136 # Despite MSDN stating that Bthprops.dll contains the 145 # Despite MSDN stating that Bthprops.dll contains the
137 # symbols declared by bthprops.lib, they actually reside here: 146 # symbols declared by bthprops.lib, they actually reside here:
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 'test/mock_bluetooth_gatt_descriptor.h', 223 'test/mock_bluetooth_gatt_descriptor.h',
215 'test/mock_bluetooth_gatt_notify_session.cc', 224 'test/mock_bluetooth_gatt_notify_session.cc',
216 'test/mock_bluetooth_gatt_notify_session.h', 225 'test/mock_bluetooth_gatt_notify_session.h',
217 'test/mock_bluetooth_gatt_service.cc', 226 'test/mock_bluetooth_gatt_service.cc',
218 'test/mock_bluetooth_gatt_service.h', 227 'test/mock_bluetooth_gatt_service.h',
219 'test/mock_bluetooth_socket.cc', 228 'test/mock_bluetooth_socket.cc',
220 'test/mock_bluetooth_socket.h', 229 'test/mock_bluetooth_socket.h',
221 ], 230 ],
222 }, 231 },
223 ], 232 ],
233 'conditions': [
234 ['OS == "android"', {
235 'targets': [
236 {
237 'target_name': 'device_bluetooth_jni_headers',
238 'type': 'none',
239 'sources': [
240 'android/java/src/org/chromium/device/bluetooth/BluetoothAdapter.jav a',
241 ],
242 'variables': {
243 'jni_gen_package': 'device_bluetooth',
244 },
245 'includes': [ '../../build/jni_generator.gypi' ],
246 },
247 {
248 'target_name': 'device_bluetooth_java',
249 'type': 'none',
250 'dependencies': [
251 '../../base/base.gyp:base',
252 ],
253 'variables': {
254 'java_in_dir': '../../device/bluetooth/android/java',
255 },
256 'includes': [ '../../build/java.gypi' ],
257 },
258 ],
259 }],
260 ],
224 } 261 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698