device/bluetooth/bluetooth.gyp - Issue 1215303006: bluetooth: android: Initial BluetoothDeviceAndroid implementation.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: device/bluetooth/bluetooth.gyp

Issue 1215303006: bluetooth: android: Initial BluetoothDeviceAndroid implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bta-discovery-

Patch Set: Merge TOT Created 5 years, 5 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

« no previous file with comments | « device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java ('k') | device/bluetooth/bluetooth_adapter_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/bluetooth.gyp

diff --git a/device/bluetooth/bluetooth.gyp b/device/bluetooth/bluetooth.gyp

index c81a26f3e8eb642183adbd122f3e7087a465e125..efe05fc447196815c8a26b6a3e5612fa02c75c75 100644

--- a/device/bluetooth/bluetooth.gyp

+++ b/device/bluetooth/bluetooth.gyp

@@ -55,6 +55,8 @@

'bluetooth_classic_device_mac.h',

'bluetooth_device.cc',

'bluetooth_device.h',

+ 'bluetooth_device_android.h',

+ 'bluetooth_device_android.cc',

'bluetooth_device_chromeos.cc',

'bluetooth_device_chromeos.h',

'bluetooth_device_mac.mm',

@@ -247,6 +249,7 @@

'type': 'none',

'sources': [

'android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java',

+ 'android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java',

'android/java/src/org/chromium/device/bluetooth/Wrappers.java',

'variables': {