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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: device/bluetooth/bluetooth.gyp
diff --git a/device/bluetooth/bluetooth.gyp b/device/bluetooth/bluetooth.gyp
index b89e91a8ff4b0ef962f617c3b54b8f21714300cd..4d734c5204b6bc185a77a13c306518fb481eef98 100644
--- a/device/bluetooth/bluetooth.gyp
+++ b/device/bluetooth/bluetooth.gyp
@@ -125,6 +125,15 @@
'../../build/linux/system.gyp:dbus'
]
}],
+ ['OS == "android"', {
+ 'dependencies': [
+ 'device_bluetooth_jni_headers',
+ ],
+ 'sources': [
+ 'android/bluetooth_jni_registrar.cc',
+ 'android/bluetooth_jni_registrar.h',
+ ],
+ }],
['OS=="win"', {
# The following two blocks are duplicated. They apply to static lib
# and shared lib configurations respectively.
@@ -221,4 +230,32 @@
],
},
],
+ 'conditions': [
+ ['OS == "android"', {
+ 'targets': [
+ {
+ 'target_name': 'device_bluetooth_jni_headers',
+ 'type': 'none',
+ 'sources': [
+ 'android/java/src/org/chromium/device/bluetooth/BluetoothAdapter.java',
+ ],
+ 'variables': {
+ 'jni_gen_package': 'device_bluetooth',
+ },
+ 'includes': [ '../../build/jni_generator.gypi' ],
+ },
+ {
+ 'target_name': 'device_bluetooth_java',
+ 'type': 'none',
+ 'dependencies': [
+ '../../base/base.gyp:base',
+ ],
+ 'variables': {
+ 'java_in_dir': '../../device/bluetooth/android/java',
+ },
+ 'includes': [ '../../build/java.gypi' ],
+ },
+ ],
+ }],
+ ],
}

Powered by Google App Engine
This is Rietveld 408576698