psmattas/android_system_qcom-lineage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qsap: Fix VNDK compilation issues of libqsap.

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

Change-Id: I1213fc40335fba7ea52c4c296b28bc66cba72701
CRs-Fixed: 2244720
This commit is contained in:
Veerendranath Jakkam
2018-05-18 18:41:15 +05:30
parent 20f62e8554
commit c613ebbc1c
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
softap/sdk/Android.mk
View File

@@ -68,5 +68,7 @@ LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := libnetutils libutils libbinder libcutils libhardware_legacy libnl LOCAL_SHARED_LIBRARIES := libnetutils libutils libbinder libcutils libhardware_legacy libnl
LOCAL_HEADER_LIBRARIES := libcutils_headers
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

17
softap/sdk/qsap.c
View File

@@ -33,6 +33,8 @@
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h>
#include <sched.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <linux/if.h> #include <linux/if.h>
@@ -46,11 +48,12 @@
#define LOG_TAG "QCLDR-" #define LOG_TAG "QCLDR-"
#include "cutils/log.h" #include <cutils/log.h>
#include "cutils/memory.h" #include <cutils/memory.h>
#include "cutils/misc.h" #include <cutils/misc.h>
#include "cutils/properties.h" #include <cutils/properties.h>
#include "private/android_filesystem_config.h" #include <grp.h>
#include <pwd.h>
#include "qsap_api.h" #include "qsap_api.h"
#include "qsap.h" #include "qsap.h"
@@ -631,9 +634,9 @@ int wigig_ensure_entropy_file_exists()
return -1; 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", 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); unlink(WIGIG_ENTROPY_FILE);
return -1; return -1;
} }

5
softap/sdk/qsap_api.c
View File

@@ -43,7 +43,6 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include <private/android_filesystem_config.h>
#include <net/if.h> #include <net/if.h>
#include <net/if_arp.h> #include <net/if_arp.h>
#include <netlink/netlink.h> #include <netlink/netlink.h>
@@ -67,8 +66,8 @@
#define LOG_TAG "QCSDK" #define LOG_TAG "QCSDK"
#include "cutils/properties.h" #include <cutils/properties.h>
#include "cutils/log.h" #include <cutils/log.h>
#define SKIP_BLANK_SPACE(x) {while(*x != '\0') { if((*x == ' ') || (*x == '\t')) x++; else break; }} #define SKIP_BLANK_SPACE(x) {while(*x != '\0') { if((*x == ' ') || (*x == '\t')) x++; else break; }}