Re-layout Android.mk for single shared library

diff --git a/audio_a2dp_hw/Android.mk b/audio_a2dp_hw/Android.mk
index 6fb83cb..86dd5a7 100644 (file)
--- a/audio_a2dp_hw/Android.mk
+++ b/audio_a2dp_hw/Android.mk
@@ -9,7 +9,7 @@ LOCAL_C_INCLUDES += \
        . \
        $(LOCAL_PATH)/../utils/include
 
-LOCAL_CFLAGS += -std=c99
+LOCAL_CFLAGS += -std=c99 $(bdroid_CFLAGS)
 
 LOCAL_MODULE := audio.a2dp.default
 LOCAL_MODULE_RELATIVE_PATH := hw
@@ -18,4 +18,4 @@ LOCAL_SHARED_LIBRARIES := libcutils liblog
 
 LOCAL_MODULE_TAGS := optional
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)

diff --git a/hci/Android.mk b/hci/Android.mk
index 2baff82..7f892d8 100644 (file)
--- a/hci/Android.mk
+++ b/hci/Android.mk
@@ -41,7 +41,6 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 include $(BUILD_STATIC_LIBRARY)
 
 #####################################################
-
 include $(CLEAR_VARS)
 
 LOCAL_C_INCLUDES := \

diff --git a/main/Android.mk b/main/Android.mk
index cad90f6..15c5b9b 100644 (file)
--- a/main/Android.mk
+++ b/main/Android.mk
@@ -145,6 +145,7 @@ LOCAL_REQUIRED_MODULES := \
     bt_stack.conf \
     libbt-hci \
     libbt-vendor
+
 LOCAL_MULTILIB := 32
 
 include $(BUILD_SHARED_LIBRARY)