diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-12-05 08:23:21 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-12-05 08:23:21 -0800 |
| commit | 6638957a2b113772e224008197a2f5daad26d766 (patch) | |
| tree | 3853d853f06e83cdfea275633b61029b7587682d | |
| parent | b80a9310f8ef0f3a72ec41d054a53e64a5cc839e (diff) | |
| parent | 31e8bcd02ccd82da80040f7f1e124d0521e2901f (diff) | |
| download | wpan-6638957a2b113772e224008197a2f5daad26d766.tar.gz | |
resolved conflicts for merge of 31e8bcd0 to master
Change-Id: Ic907b3ee763198beacfa128346dede0a07f60b63
| -rw-r--r-- | bluedroid_wilink/Android.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/bluedroid_wilink/Android.mk b/bluedroid_wilink/Android.mk index 9d9c248..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_SHARED_LIBRARIES := \ LOCAL_PRELINK_MODULE := false LOCAL_MODULE := libbt-vendor LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(PRODUCT_OUT)/system/vendor/lib +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES) include $(BUILD_SHARED_LIBRARY) |