summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-09-24 03:31:47 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2014-09-24 03:31:47 -0700
commitdc387d32641ef49a3f7ff386358717e09c821e99 (patch)
tree4a93f7058728981b48dbdb146ec74039157559e3
parenta594dff97271c86558267881b5efd3fd3a251c34 (diff)
parentdec868658ee43cba9dc1ed07a9aa5d737c517582 (diff)
downloadandroid_packages_apps_BluetoothExt-dc387d32641ef49a3f7ff386358717e09c821e99.tar.gz
android_packages_apps_BluetoothExt-dc387d32641ef49a3f7ff386358717e09c821e99.tar.bz2
android_packages_apps_BluetoothExt-dc387d32641ef49a3f7ff386358717e09c821e99.zip
Merge "Revert "Bluetooth-Wipower: Add compilation flag""
-rw-r--r--Android.mk13
1 files 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