Remove headers from LOCAL_SRC_FILES

The build system does not use headers or directories in LOCAL_SRC_FILES.
To prevent typos, it's becoming a warning to add something to
LOCAL_SRC_FILES that is not used.

Also remove default values while we're here.

Change-Id: Ide7b6ecbe21933719736342d4d545368788c652b

diff --git a/hci/Android.mk b/hci/Android.mk
index e267812..da2c7bd 100644 (file)
--- a/hci/Android.mk
+++ b/hci/Android.mk
@@ -36,8 +36,6 @@ LOCAL_C_INCLUDES += \
     $(bdroid_C_INCLUDES)
 
 LOCAL_MODULE := libbt-hci
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -63,8 +61,7 @@ LOCAL_SRC_FILES := \
     ./test/hci_hal_mct_test.cpp \
     ./test/hci_layer_test.cpp \
     ./test/low_power_manager_test.cpp \
-    ./test/packet_fragmenter_test.cpp \
-    $(bdroid_C_INCLUDES)
+    ./test/packet_fragmenter_test.cpp
 
 
 LOCAL_CFLAGS := -Wall -Werror $(bdroid_CFLAGS)

diff --git a/stack/Android.mk b/stack/Android.mk
index 1472751..395ff62 100644 (file)
--- a/stack/Android.mk
+++ b/stack/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_C_INCLUDES:= . \
+LOCAL_C_INCLUDES:= \
                    $(LOCAL_PATH)/include \
                    $(LOCAL_PATH)/avct \
                    $(LOCAL_PATH)/btm \
@@ -128,11 +128,8 @@ LOCAL_SRC_FILES:= \
     ./sdp/sdp_discovery.c \
     ./pan/pan_main.c \
     ./srvc/srvc_battery.c \
-    ./srvc/srvc_battery_int.h \
     ./srvc/srvc_dis.c \
-    ./srvc/srvc_dis_int.h \
     ./srvc/srvc_eng.c \
-    ./srvc/srvc_eng_int.h \
     ./pan/pan_api.c \
     ./pan/pan_utils.c \
     ./btu/btu_hcif.c \
@@ -153,10 +150,8 @@ LOCAL_SRC_FILES:= \
     ./gap/gap_utils.c
 
 LOCAL_MODULE := libbt-brcm_stack
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_STATIC_LIBRARIES := libbt-hci
-LOCAL_SHARED_LIBRARIES := libcutils libc
+LOCAL_SHARED_LIBRARIES := libcutils
 # gnu-variable-sized-type-not-at-end is needed for a variable-size header in
 # a struct.
 # const-logical-operand is needed for code in l2c_utils.c that looks intentional.