Android: Fix compilation issues
Fix compilation errors and warnings.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
diff --git a/Android.mk b/Android.mk
index f99adb0..40e6e5f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -61,6 +61,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES += \
$(LOCAL_PATH) frameworks/base/cmds/keystore system/security/keystore \
+ $(LOCAL_PATH) frameworks/opt/net/wifi/libwifi_hal/include/ \
$(LOCAL_PATH) hardware/qcom/wlan/qcwcn/wifi_hal \
$(LOCAL_PATH) system/core/include/cutils \
$(LOCAL_PATH) hardware/libhardware_legacy/include/hardware_legacy \
@@ -78,22 +79,11 @@
CFLAGS += -DANDROID_NAN
endif
endif
-ver = $(filter 4.3%,$(PLATFORM_VERSION))
-ver += $(filter 4.4%,$(PLATFORM_VERSION))
-ver += $(filter 5.0%,$(PLATFORM_VERSION))
-ver += $(filter 5.1%,$(PLATFORM_VERSION))
-ver += $(filter L%,$(PLATFORM_VERSION))
-ver += $(filter M%,$(PLATFORM_VERSION))
-ver += $(filter 6.0%,$(PLATFORM_VERSION))
-ver += $(filter N%,$(PLATFORM_VERSION))
-ver += $(filter 7.%,$(PLATFORM_VERSION))
-ifneq (,$(strip $(ver)))
CFLAGS += -DANDROID43
CFLAGS += -Wno-unused-parameter
LOCAL_C_INCLUDES += system/security/keystore/include/keystore
LOCAL_SHARED_LIBRARIES += liblog
LOCAL_SHARED_LIBRARIES += libkeystore_binder
-endif
LOCAL_SRC_FILES := $(OBJS)
LOCAL_CFLAGS := $(CFLAGS)
include $(BUILD_EXECUTABLE)
diff --git a/sta.c b/sta.c
index c8cb4a1..f7e3e27 100644
--- a/sta.c
+++ b/sta.c
@@ -384,9 +384,11 @@
static int wil6210_send_brp_rx(struct sigma_dut *dut, const char *mac,
int l_rx)
{
- struct wil_wmi_bf_trig_cmd cmd = {0};
+ struct wil_wmi_bf_trig_cmd cmd;
unsigned int cid;
+ memset(&cmd, 0, sizeof(cmd));
+
if (wil6210_get_cid(dut, mac, &cid))
return -1;
@@ -400,7 +402,9 @@
static int wil6210_send_sls(struct sigma_dut *dut, const char *mac)
{
- struct wil_wmi_bf_trig_cmd cmd = {0};
+ struct wil_wmi_bf_trig_cmd cmd;
+
+ memset(&cmd, 0, sizeof(cmd));
if (parse_mac_address(dut, mac, (unsigned char *)&cmd.dest_mac))
return -1;