diff options
| author | Hemant Gupta <hemantg@codeaurora.org> | 2014-07-18 17:10:33 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2014-11-04 08:26:02 -0700 |
| commit | 004757417790e8ca7d2679e370c4727a6c135c9a (patch) | |
| tree | 6a44abda30479acb94a0439862209e263d550282 /Android.mk | |
| parent | e281f0f38f5bcdc71a6d975543dc76667a17bdf3 (diff) | |
| download | android_packages_apps_Bluetooth-004757417790e8ca7d2679e370c4727a6c135c9a.tar.gz android_packages_apps_Bluetooth-004757417790e8ca7d2679e370c4727a6c135c9a.tar.bz2 android_packages_apps_Bluetooth-004757417790e8ca7d2679e370c4727a6c135c9a.zip | |
OPP: Support OPP1.2 Features over L2CAP.
Support OPP1.2 features. OBEX over L2CAP , SRM and SRMP.
Use javax.btobex lib instead of javax.obex for OBEX OPP,
MAP and PBAP profiles.
CRs-Fixed: 639499
Conflicts:
src/com/android/bluetooth/opp/BluetoothOppTransfer.java
src/com/android/bluetooth/map/BluetoothMapService.java
Conflicts:
Android.mk
src/com/android/bluetooth/map/BluetoothMapAuthenticator.java
src/com/android/bluetooth/map/BluetoothMapService.java
src/com/android/bluetooth/map/BluetoothMnsObexClient.java
Change-Id: I9b4e64dcc4eae44252334547d5478a12f5b9bef5
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 2b8a2ad12..d388dffda 100644 --- a/Android.mk +++ b/Android.mk @@ -21,7 +21,9 @@ LOCAL_PACKAGE_NAME := Bluetooth LOCAL_CERTIFICATE := platform LOCAL_JNI_SHARED_LIBRARIES := libbluetooth_jni -LOCAL_JAVA_LIBRARIES := javax.obex telephony-common bluetooth.mapsapi +LOCAL_JAVA_LIBRARIES := bluetooth.mapsapi +LOCAL_JAVA_LIBRARIES += javax.btobex +LOCAL_JAVA_LIBRARIES += telephony-common LOCAL_STATIC_JAVA_LIBRARIES := com.android.vcard LOCAL_REQUIRED_MODULES := bluetooth.default |