diff options
author | Hemant Gupta <hemantg@codeaurora.org> | 2014-09-24 13:50:26 +0530 |
---|---|---|
committer | Linux Build Service Account <lnxbuild@localhost> | 2014-11-04 08:26:11 -0700 |
commit | 54dde23d150c175fbf2f7c86ab280b652ea3627b (patch) | |
tree | 8b1ac85fe0afd69d3ab6f7d8fa51608fcba18037 /Android.mk | |
parent | 1edda87582ee03e5cbb638f397d4d1d8fb382762 (diff) | |
download | android_packages_apps_Bluetooth-54dde23d150c175fbf2f7c86ab280b652ea3627b.tar.gz android_packages_apps_Bluetooth-54dde23d150c175fbf2f7c86ab280b652ea3627b.tar.bz2 android_packages_apps_Bluetooth-54dde23d150c175fbf2f7c86ab280b652ea3627b.zip |
Revert "BT MAP: added support for email sharing over BT"
This reverts commit 326b5e610063ac24c0ba467ac585bd4c7f618a67.
Conflicts:
Android.mk
res/values/strings.xml
src/com/android/bluetooth/map/BluetoothMapService.java
src/com/android/bluetooth/map/BluetoothMnsObexClient.java
Change-Id: I1c1a3220d229473a6d13a568856d6001277bfa2a
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/Android.mk b/Android.mk index d388dffda..db9dcfe59 100644 --- a/Android.mk +++ b/Android.mk @@ -4,26 +4,15 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := \ - $(call all-java-files-under, lib) - -LOCAL_MODULE := bluetooth.mapsapi - -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := \ $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := Bluetooth LOCAL_CERTIFICATE := platform LOCAL_JNI_SHARED_LIBRARIES := libbluetooth_jni -LOCAL_JAVA_LIBRARIES := bluetooth.mapsapi LOCAL_JAVA_LIBRARIES += javax.btobex LOCAL_JAVA_LIBRARIES += telephony-common +LOCAL_JAVA_LIBRARIES := javax.obex telephony-common LOCAL_STATIC_JAVA_LIBRARIES := com.android.vcard LOCAL_REQUIRED_MODULES := bluetooth.default |