OSDN Git Service

(root) / android-x86 / system-bt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
am f29a2fb..e07ad10 from mirror-m-wireless-internal-release
[android-x86/system-bt.git] / main / Android.mk
diff --git a/main/Android.mk b/main/Android.mk
index d7c3d0a..9f07e37 100644 (file)
--- a/main/Android.mk
+++ b/main/Android.mk
@@ -1,4 +1,4 @@
-LOCAL_PATH := $(call my-dir)
+LOCAL_PATH:= $(call my-dir)
 
 #
 # Bluetooth HW module
@@ -11,58 +11,61 @@ LOCAL_SRC_FILES:= \
        ../btif/src/bluetooth.c
 
 # platform specific
-LOCAL_SRC_FILES += \
-       bte_conf.c \
+LOCAL_SRC_FILES+= \
+       bte_main.c \
        bte_init.c \
        bte_logmsg.c \
-       bte_main.c
+       bte_conf.c \
+       stack_config.c
 
 # BTIF
 LOCAL_SRC_FILES += \
-       ../btif/src/btif_av.c \
-       ../btif/src/btif_config.c \
-       ../btif/src/btif_config_util.cpp \
-       ../btif/src/btif_core.c \
-       ../btif/src/btif_dm.c \
-       ../btif/src/btif_gatt.c \
-       ../btif/src/btif_gatt_client.c \
-       ../btif/src/btif_gatt_multi_adv_util.c \
-       ../btif/src/btif_gatt_server.c \
-       ../btif/src/btif_gatt_test.c \
-       ../btif/src/btif_gatt_util.c \
-       ../btif/src/btif_hf.c \
-       ../btif/src/btif_hf_client.c \
-       ../btif/src/btif_hh.c \
-       ../btif/src/btif_hl.c \
-       ../btif/src/btif_mce.c \
-       ../btif/src/btif_media_task.c \
-       ../btif/src/btif_pan.c \
-       ../btif/src/btif_profile_queue.c \
-       ../btif/src/btif_rc.c \
-       ../btif/src/btif_sm.c \
-       ../btif/src/btif_sock.c \
-       ../btif/src/btif_sock_rfc.c \
-       ../btif/src/btif_sock_sdp.c \
-       ../btif/src/btif_sock_thread.c \
-       ../btif/src/btif_sock_util.c \
-       ../btif/src/btif_storage.c \
-       ../btif/src/btif_util.c
+    ../btif/src/btif_av.c \
+    ../btif/src/btif_config.c \
+    ../btif/src/btif_config_transcode.cpp \
+    ../btif/src/btif_core.c \
+    ../btif/src/btif_dm.c \
+    ../btif/src/btif_gatt.c \
+    ../btif/src/btif_gatt_client.c \
+    ../btif/src/btif_gatt_multi_adv_util.c \
+    ../btif/src/btif_gatt_server.c \
+    ../btif/src/btif_gatt_test.c \
+    ../btif/src/btif_gatt_util.c \
+    ../btif/src/btif_hf.c \
+    ../btif/src/btif_hf_client.c \
+    ../btif/src/btif_hh.c \
+    ../btif/src/btif_hl.c \
+    ../btif/src/btif_sdp.c \
+    ../btif/src/btif_media_task.c \
+    ../btif/src/btif_pan.c \
+    ../btif/src/btif_profile_queue.c \
+    ../btif/src/btif_rc.c \
+    ../btif/src/btif_sm.c \
+    ../btif/src/btif_sock.c \
+    ../btif/src/btif_sock_rfc.c \
+    ../btif/src/btif_sock_l2cap.c \
+    ../btif/src/btif_sock_sco.c \
+    ../btif/src/btif_sock_sdp.c \
+    ../btif/src/btif_sock_thread.c \
+    ../btif/src/btif_sdp_server.c \
+    ../btif/src/btif_sock_util.c \
+    ../btif/src/btif_storage.c \
+    ../btif/src/btif_util.c \
+    ../btif/src/stack_manager.c
 
 # callouts
-LOCAL_SRC_FILES += \
-       ../btif/co/bta_ag_co.c \
-       ../btif/co/bta_av_co.c \
-       ../btif/co/bta_dm_co.c \
-       ../btif/co/bta_fs_co.c \
-       ../btif/co/bta_gattc_co.c \
-       ../btif/co/bta_gatts_co.c \
-       ../btif/co/bta_hh_co.c \
-       ../btif/co/bta_hl_co.c \
-       ../btif/co/bta_pan_co.c \
-       ../btif/co/bta_sys_co.c
+LOCAL_SRC_FILES+= \
+    ../btif/co/bta_ag_co.c \
+    ../btif/co/bta_dm_co.c \
+    ../btif/co/bta_av_co.c \
+    ../btif/co/bta_hh_co.c \
+    ../btif/co/bta_hl_co.c \
+    ../btif/co/bta_pan_co.c \
+    ../btif/co/bta_gattc_co.c \
+    ../btif/co/bta_gatts_co.c \
 
 # sbc encoder
-LOCAL_SRC_FILES += \
+LOCAL_SRC_FILES+= \
        ../embdrv/sbc/encoder/srce/sbc_analysis.c \
        ../embdrv/sbc/encoder/srce/sbc_dct.c \
        ../embdrv/sbc/encoder/srce/sbc_dct_coeffs.c \
@@ -72,13 +75,15 @@ LOCAL_SRC_FILES += \
        ../embdrv/sbc/encoder/srce/sbc_encoder.c \
        ../embdrv/sbc/encoder/srce/sbc_packing.c \
 
-LOCAL_SRC_FILES += \
+LOCAL_SRC_FILES+= \
        ../udrv/ulinux/uipc.c
 
-LOCAL_C_INCLUDES += . \
+LOCAL_C_INCLUDES+= . \
+       $(LOCAL_PATH)/../ \
        $(LOCAL_PATH)/../bta/include \
        $(LOCAL_PATH)/../bta/sys \
        $(LOCAL_PATH)/../bta/dm \
+       $(LOCAL_PATH)/../btcore/include \
        $(LOCAL_PATH)/../osi/include \
        $(LOCAL_PATH)/../gki/common \
        $(LOCAL_PATH)/../gki/ulinux \
@@ -96,6 +101,7 @@ LOCAL_C_INCLUDES += . \
        $(LOCAL_PATH)/../btif/co \
        $(LOCAL_PATH)/../hci/include\
        $(LOCAL_PATH)/../vnd/include \
+       $(LOCAL_PATH)/../brcm/include \
        $(LOCAL_PATH)/../embdrv/sbc/encoder/include \
        $(LOCAL_PATH)/../embdrv/sbc/decoder/include \
        $(LOCAL_PATH)/../audio_a2dp_hw \
@@ -107,43 +113,47 @@ LOCAL_CFLAGS += -DBUILDCFG $(bdroid_CFLAGS) -Wno-error=maybe-uninitialized -Wno-
 LOCAL_CONLYFLAGS := -std=c99
 
 ifeq ($(TARGET_PRODUCT), full_crespo)
-       LOCAL_CFLAGS += -DTARGET_CRESPO
+     LOCAL_CFLAGS += -DTARGET_CRESPO
 endif
 ifeq ($(TARGET_PRODUCT), full_crespo4g)
-       LOCAL_CFLAGS += -DTARGET_CRESPO
+     LOCAL_CFLAGS += -DTARGET_CRESPO
 endif
 ifeq ($(TARGET_PRODUCT), full_maguro)
-       LOCAL_CFLAGS += -DTARGET_MAGURO
+     LOCAL_CFLAGS += -DTARGET_MAGURO
 endif
 
 LOCAL_SHARED_LIBRARIES := \
-       libcutils \
-       libdl \
-       liblog \
-       libpower
+    libcutils \
+    libdl \
+    liblog \
+    libpower \
 
 LOCAL_STATIC_LIBRARIES := \
-       libbt-brcm_bta \
-       libbt-brcm_gki \
-       libbt-brcm_stack \
-       libbt-hci \
-       libbt-utils \
-       libbt-qcom_sbc_decoder \
-       libosi \
-       libtinyxml2 \
-       libbt-qcom_sbc_decoder
+    libbt-brcm_bta \
+    libbt-brcm_gki \
+    libbt-brcm_stack \
+    libbtdevice \
+    libbt-hci \
+    libbt-utils \
+    libbtcore \
+    libosi \
+    libtinyxml2 \
+    libbt-qcom_sbc_decoder
 
 LOCAL_MODULE := bluetooth.default
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_REQUIRED_MODULES := \
-       auto_pair_devlist.conf \
-       bt_did.conf \
-       bt_stack.conf \
-       libbt-vendor
+    auto_pair_devlist.conf \
+    bt_did.conf \
+    bt_stack.conf \
+    libbt-hci \
+    libbt-vendor
+
 LOCAL_MULTILIB := 32
 
 LOCAL_CLANG_CFLAGS := -Wno-error=gnu-variable-sized-type-not-at-end
+LOCAL_CLANG_CFLAGS += -Wno-typedef-redefinition
 
 include $(BUILD_SHARED_LIBRARY)
system/bt
About OSDN
Find Software
Develop Software
Help