diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-12-04 13:14:28 -0800 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-12-04 13:14:28 -0800 |
commit | 31e8bcd02ccd82da80040f7f1e124d0521e2901f (patch) | |
tree | 3853d853f06e83cdfea275633b61029b7587682d | |
parent | a6c7533482b13ed6e6fe18aed73ae02907af77c3 (diff) | |
parent | 16241d46a1332eddda99f578214a4a3900929173 (diff) | |
download | wpan-31e8bcd02ccd82da80040f7f1e124d0521e2901f.tar.gz |
Merge "Clean up makefiles"tools_r22jb-mr1.1-dev-plus-aospjb-mr1-dev-plus-aosp
-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 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_SHARED_LIBRARIES := \ 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) |