More HAL fixes

This change implements all message interaction with Broadcom's drivers; and
enables three basic features; scan, hotlist and significant wifi change.

There are GSCAN API changes too -
1. The on_scan_results event is changed to on_scan_results_available
This is to make a single path for retrieving scan results - via the
get_cached_scan_results method.
2. Updated set_significant_change_handler method to include params
3. Updated some parameter names
4. Specified sizes on all arrays.

Change-Id: I39936e1cc84c273b86b86c2e2085cb7b924cafb8

1 files changed, 39 insertions, 42 deletions

diff --git a/service/Android.mk b/service/Android.mk
index 2659732c5..a59078dfc 100644
--- a/service/Android.mk
+++ b/service/Android.mk
@@ -16,21 +16,6 @@ LOCAL_PATH := $(call my-dir)
 
 ifneq ($(TARGET_BUILD_PDK), true)
 
-include $(CLEAR_VARS)
-
-LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/java
-LOCAL_SRC_FILES := $(call all-java-files-under, java) \
-	$(call all-Iaidl-files-under, java) \
-	$(call all-logtags-files-under, java)
-
-LOCAL_JNI_SHARED_LIBRARIES := libandroid_runtime
-LOCAL_JAVA_LIBRARIES := services
-LOCAL_REQUIRED_MODULES := services
-LOCAL_MODULE_TAGS :=
-LOCAL_MODULE := wifi-service
-
-include $(BUILD_JAVA_LIBRARY)
-
 # Make the HAL library
 # ============================================================
 include $(CLEAR_VARS)
@@ -54,8 +39,9 @@ LOCAL_MODULE := libwifi-hal
 
 include $(BUILD_STATIC_LIBRARY)
 
-# Make the JNI part
+# Build the halutil
 # ============================================================
+
 include $(CLEAR_VARS)
 
 LOCAL_REQUIRED_MODULES := libandroid_runtime libhardware_legacy
@@ -65,34 +51,25 @@ LOCAL_CFLAGS += -Wno-maybe-uninitialized -Wno-parentheses
 LOCAL_CPPFLAGS += -Wno-conversion-null
 
 LOCAL_C_INCLUDES += \
-	$(JNI_H_INCLUDE) \
-	$(call include-path-for, libhardware)/hardware \
-	$(call include-path-for, libhardware_legacy)/hardware_legacy \
 	libcore/include \
 	$(LOCAL_PATH)/lib
 
 LOCAL_SHARED_LIBRARIES += \
-	libnativehelper \
 	libcutils \
-	libutils \
-	libhardware \
-	libhardware_legacy \
-	libandroid_runtime  \
-	libnl
+	libnl \
+	libandroid_runtime
 
-LOCAL_STATIC_LIBRARIES += libwifi-hal
+LOCAL_STATIC_LIBRARIES += libwifi-hal libc libutils
 
 LOCAL_SRC_FILES := \
-	jni/com_android_server_wifi_WifiNative.cpp \
-	jni/jni_helper.cpp
+	tools/halutil/halutil.cpp
 
-LOCAL_MODULE := libwifi-service
+LOCAL_MODULE := halutil
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_EXECUTABLE)
 
-# Build the halutil
+# Make the JNI part
 # ============================================================
-
 include $(CLEAR_VARS)
 
 LOCAL_REQUIRED_MODULES := libandroid_runtime libhardware_legacy
@@ -102,27 +79,47 @@ LOCAL_CFLAGS += -Wno-maybe-uninitialized -Wno-parentheses
 LOCAL_CPPFLAGS += -Wno-conversion-null
 
 LOCAL_C_INCLUDES += \
+	$(JNI_H_INCLUDE) \
+	$(call include-path-for, libhardware)/hardware \
+	$(call include-path-for, libhardware_legacy)/hardware_legacy \
 	libcore/include \
 	$(LOCAL_PATH)/lib
 
-LOCAL_SHARES_LIBRARIES += \
-	libcutils \
-	libutils \
-	libandroid_runtime
-
-LOCAL_STATIC_LIBRARIES := libwifi-hal libnl_2
 
 LOCAL_SHARED_LIBRARIES += \
 	libnativehelper \
 	libcutils \
 	libutils \
 	libhardware \
-	libhardware_legacy
+	libhardware_legacy \
+	libandroid_runtime
+
+LOCAL_STATIC_LIBRARIES += libwifi-hal libnl_2
 
 LOCAL_SRC_FILES := \
-	tools/halutil/halutil.cpp
+	jni/com_android_server_wifi_WifiNative.cpp \
+	jni/jni_helper.cpp
 
-LOCAL_MODULE := halutil
+LOCAL_MODULE := libwifi-service
 
-include $(BUILD_EXECUTABLE)
+include $(BUILD_SHARED_LIBRARY)
+
+# Build the java code
+# ============================================================
+
+include $(CLEAR_VARS)
+
+LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/java
+LOCAL_SRC_FILES := $(call all-java-files-under, java) \
+	$(call all-Iaidl-files-under, java) \
+	$(call all-logtags-files-under, java)
+
+LOCAL_JNI_SHARED_LIBRARIES := libandroid_runtime
+LOCAL_JAVA_LIBRARIES := services
+LOCAL_REQUIRED_MODULES := services
+LOCAL_MODULE_TAGS :=
+LOCAL_MODULE := wifi-service
+
+include $(BUILD_JAVA_LIBRARY)
 
+endif