From c613ebbc1c8ef6d7b572f62244589a1bb00ce350 Mon Sep 17 00:00:00 2001
From: Veerendranath Jakkam <vjakkam@codeaurora.org>
Date: Fri, 18 May 2018 18:41:15 +0530
Subject: [PATCH] qsap: Fix VNDK compilation issues of libqsap.

- Removed "android_filesystem_config.h" references.
- Added cutils header library in Android.mk.
- Added required system headers explicitly.

Change-Id: I1213fc40335fba7ea52c4c296b28bc66cba72701
CRs-Fixed: 2244720
---
 softap/sdk/Android.mk |  2 ++
 softap/sdk/qsap.c     | 17 ++++++++++-------
 softap/sdk/qsap_api.c |  5 ++---
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/softap/sdk/Android.mk b/softap/sdk/Android.mk
index 7c9dbf5..c859cc2 100755
--- a/softap/sdk/Android.mk
+++ b/softap/sdk/Android.mk
@@ -68,5 +68,7 @@ LOCAL_PRELINK_MODULE := false
 
 LOCAL_SHARED_LIBRARIES := libnetutils libutils libbinder libcutils libhardware_legacy libnl
 
+LOCAL_HEADER_LIBRARIES := libcutils_headers
+
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/softap/sdk/qsap.c b/softap/sdk/qsap.c
index dd9d388..84b22d6 100644
--- a/softap/sdk/qsap.c
+++ b/softap/sdk/qsap.c
@@ -33,6 +33,8 @@
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
+#include <unistd.h>
+#include <sched.h>
 
 #include <sys/socket.h>
 #include <linux/if.h>
@@ -46,11 +48,12 @@
 
 #define LOG_TAG "QCLDR-"
 
-#include "cutils/log.h"
-#include "cutils/memory.h"
-#include "cutils/misc.h"
-#include "cutils/properties.h"
-#include "private/android_filesystem_config.h"
+#include <cutils/log.h>
+#include <cutils/memory.h>
+#include <cutils/misc.h>
+#include <cutils/properties.h>
+#include <grp.h>
+#include <pwd.h>
 
 #include "qsap_api.h"
 #include "qsap.h"
@@ -631,9 +634,9 @@ int wigig_ensure_entropy_file_exists()
         return -1;
     }
 
-    if (chown(WIGIG_ENTROPY_FILE, AID_SYSTEM, AID_WIFI) < 0) {
+    if (chown(WIGIG_ENTROPY_FILE, getpwnam("system")->pw_uid, getgrnam("wifi")->gr_gid) < 0) {
         ALOGE("Error changing group ownership of %s to %d: %s",
-              WIGIG_ENTROPY_FILE, AID_WIFI, strerror(errno));
+              WIGIG_ENTROPY_FILE, getgrnam("wifi")->gr_gid, strerror(errno));
         unlink(WIGIG_ENTROPY_FILE);
         return -1;
     }
diff --git a/softap/sdk/qsap_api.c b/softap/sdk/qsap_api.c
index 3b89c2b..30b8aad 100644
--- a/softap/sdk/qsap_api.c
+++ b/softap/sdk/qsap_api.c
@@ -43,7 +43,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <private/android_filesystem_config.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <netlink/netlink.h>
@@ -67,8 +66,8 @@
 
 #define LOG_TAG "QCSDK"
 
-#include "cutils/properties.h"
-#include "cutils/log.h"
+#include <cutils/properties.h>
+#include <cutils/log.h>
 
 #define SKIP_BLANK_SPACE(x) {while(*x != '\0') { if((*x == ' ') || (*x == '\t')) x++; else break; }}