From dec868658ee43cba9dc1ed07a9aa5d737c517582 Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Tue, 23 Sep 2014 19:45:33 +0530 Subject: Revert "Bluetooth-Wipower: Add compilation flag" This reverts commit 841649ae6f15bd13b4084e8e4eb28bc7aec49f91. Without this patch bluetooth was crashing because of missing files for wipower in bluetoothext.apk Change-Id: I3072cf88e14a95a81675742cf004ce9833517ca1 CRs-Fixed: 728710 --- Android.mk | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Android.mk b/Android.mk index 01a8e3f..4f455e2 100644 --- a/Android.mk +++ b/Android.mk @@ -9,21 +9,18 @@ src_dirs:= src/org/codeaurora/bluetooth/btcservice \ src/org/codeaurora/bluetooth/dun \ src/org/codeaurora/bluetooth/sap \ src/org/codeaurora/bluetooth/pxpservice \ + src/org/codeaurora/bluetooth/a4wp + +LOCAL_SRC_FILES := \ + $(call all-java-files-under, $(src_dirs)) \ + src/org/codeaurora/bluetooth/pxpservice/IPxpService.aidl LOCAL_PACKAGE_NAME := BluetoothExt LOCAL_CERTIFICATE := platform LOCAL_JAVA_LIBRARIES := javax.obex LOCAL_JAVA_LIBRARIES += mms-common LOCAL_JAVA_LIBRARIES += telephony-common - -ifeq ($(BOARD_USES_WIPOWER),true) -src_dirs += src/org/codeaurora/bluetooth/a4wp LOCAL_JAVA_LIBRARIES += com.quicinc.wbc -endif - -LOCAL_SRC_FILES := \ - $(call all-java-files-under, $(src_dirs)) \ - src/org/codeaurora/bluetooth/pxpservice/IPxpService.aidl LOCAL_STATIC_JAVA_LIBRARIES := com.android.vcard -- cgit v1.2.3