Merge "Clean up makefiles"
diff --git a/bluedroid_wilink/Android.mk b/bluedroid_wilink/Android.mk
index 4cc9c05..931fc30 100644
--- a/bluedroid_wilink/Android.mk
+++ b/bluedroid_wilink/Android.mk
@@ -17,15 +17,13 @@
ifeq ($(TARGET_DEVICE),panda)
LOCAL_PATH := $(call my-dir)
-BLUEDROID_PATH := external/bluetooth/bluedroid/
include $(CLEAR_VARS)
-LOCAL_C_INCLUDES :=\
- $(BLUEDROID_PATH)/hci/include
+LOCAL_C_INCLUDES := external/bluetooth/bluedroid/hci/include
-LOCAL_CFLAGS:= -g -c -W -Wall -O2 -D_POSIX_SOURCE
+LOCAL_CFLAGS := -g -c -W -Wall -O2 -D_POSIX_SOURCE
-LOCAL_SRC_FILES += libbt-vendor-ti.c
+LOCAL_SRC_FILES := libbt-vendor-ti.c
LOCAL_SHARED_LIBRARIES := \
libnativehelper \
@@ -36,7 +34,7 @@
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libbt-vendor
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(ANDROID_PRODUCT_OUT)/system/vendor/lib
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
include $(BUILD_SHARED_LIBRARY)
