softap: Fix for VNDK_VERSION=current

Change-Id: I3925e794f5c065bd2843a4ea4c9fe122c182d5b3

softap/jni/Android.mk

@@ -15,6 +15,6 @@ LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
                     $(JNI_H_INCLUDE)
 
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
-LOCAL_SHARED_LIBRARIES := libsysutils libcutils libnetutils libcrypto
+LOCAL_SHARED_LIBRARIES := libsysutils libcutils libnetutils libcrypto liblog
 
 include $(BUILD_SHARED_LIBRARY)

softap/sdk/Android.mk

@@ -12,7 +12,7 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_CFLAGS += -DSDK_VERSION=\"0.0.1.0\"
 
-LOCAL_LDLIBS := -llog
+LOCAL_USE_VNDK := true
 
 LOCAL_COPY_HEADERS_TO := sdk/softap/include
 LOCAL_COPY_HEADERS := qsap_api.h
@@ -63,7 +63,9 @@ LOCAL_SRC_FILES := qsap_api.c \
 
 LOCAL_PRELINK_MODULE := false
 
-LOCAL_SHARED_LIBRARIES := libnetutils libutils libbinder libcutils libhardware_legacy libnl
+LOCAL_SHARED_LIBRARIES := libnetutils libutils libbinder libcutils libhardware_legacy libnl liblog
+
+LOCAL_VENDOR_MODULE := true
 
 include $(BUILD_SHARED_LIBRARY)
 

softap/sdk/qsap.c

@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <sched.h>
 #include <string.h>
 #include <stdio.h>
 
@@ -46,11 +47,11 @@
 
 #define LOG_TAG "QCLDR-"
 
-#include "cutils/log.h"
+#include "log/log.h"
 #include "cutils/memory.h"
 #include "cutils/misc.h"
 #include "cutils/properties.h"
-#include "private/android_filesystem_config.h"
+#include "cutils/android_filesystem_config.h"
 
 #include "qsap_api.h"
 #include "qsap.h"

softap/sdk/qsap_api.c

@@ -43,7 +43,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <private/android_filesystem_config.h>
+#include <cutils/android_filesystem_config.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <netlink/netlink.h>