openharmony/third_party_f2fs-tools
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_f2fs-tools synced 2024-11-23 10:10:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

configure.ac: Detect selinux/android.h

Browse Source 
commit ef011a49f3c640c59c7e21c3816d01c039711c58
category: bugfix
issue: #I6VAS0
CVE: NA

Signed-off-by: DongSenhao <dongsenhao2@huawei.com>
---------------------------------------

The selinux/android.h header file is available in Android but not in the
Android NDK. Hence this patch that detects presence of that header file
at configure time.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: dongsenhao <dongsenhao2@huawei.com>
This commit is contained in:
Bart Van Assche 2022-04-21 15:18:24 -07:00 committed by dongsenhao
parent 89274e8c32
commit 20a09c8920
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -108,6 +108,7 @@ AC_CHECK_HEADERS(m4_flatten([
mntent.h
pthread_time.h
scsi/sg.h
selinux/android.h
selinux/selinux.h
sparse/sparse.h
stdlib.h

4
fsck/sload.c
View File

@ -33,7 +33,7 @@ typedef void (*fs_config_f)(const char *path, int dir,
#ifndef _WIN32
static fs_config_f fs_config_func = NULL;
#ifdef WITH_ANDROID
#ifdef HAVE_SELINUX_ANDROID_H
#include <selinux/android.h>
#include <private/android_filesystem_config.h>
#include <private/canned_fs_config.h>
@ -326,7 +326,7 @@ static int configure_files(void)
#endif
skip:
#endif
#ifdef WITH_ANDROID
#ifdef HAVE_SELINUX_ANDROID_H
/* Load the FS config */
if (c.fs_config_file) {
int ret = load_canned_fs_config(c.fs_config_file);

1
include/android_config.h
View File

@ -28,6 +28,7 @@
#define HAVE_LLSEEK 1
#define HAVE_LSEEK64 1
#define HAVE_MEMSET 1
#define HAVE_SELINUX_ANDROID_H 1
#define HAVE_SETMNTENT 1
#define HAVE_SPARSE_SPARSE_H 1