openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Move android_filesystem_config.h => fs_config.h" into oc-mr1-dev

This commit is contained in:
Yifan Hong 2017-08-03 22:53:07 +00:00 committed by Android (Google) Code Review
parent b3ecb59163 aadcb26adb
commit f004d8de4d
6 changed files with 52 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/private/fs_config.h Normal file
View File

@ -0,0 +1,4 @@
// TODO(b/63135587) remove this file after the transitive dependency
// from private/android_filesystem_config.h is resolved. All files that use
// libcutils/include/private/fs_config.h should include the file directly, not
// indirectly via private/android_filesystem_config.h.

1
libcutils/canned_fs_config.c
View File

@ -23,6 +23,7 @@
#include <string.h>
#include <private/android_filesystem_config.h>
#include <private/fs_config.h>
#include <private/canned_fs_config.h>
typedef struct {

1
libcutils/include/cutils/android_filesystem_config.h Symbolic link
View File

@ -0,0 +1 @@
../private/android_filesystem_config.h

47
libcutils/include/private/android_filesystem_config.h
View File

@ -14,11 +14,6 @@
* limitations under the License.
*/
/* This file is used to define the properties of the filesystem
** images generated by build tools (mkbootfs and mkyaffs2image) and
** by the device side of adb.
*/
/*
* This file is consumed by build/tools/fs_config and is used
* for generating various files. Anything #define AID_<name>
@ -49,18 +44,12 @@
#ifndef _ANDROID_FILESYSTEM_CONFIG_H_
#define _ANDROID_FILESYSTEM_CONFIG_H_
#include <stdint.h>
#include <sys/cdefs.h>
#include <sys/types.h>
#if defined(__BIONIC__)
#include <linux/capability.h>
#else
#include "android_filesystem_capability.h"
#if !defined(__ANDROID_VNDK__) && !defined(EXCLUDE_FS_CONFIG_STRUCTURES)
#include <private/fs_config.h>
#endif
#define CAP_MASK_LONG(cap_name) (1ULL << (cap_name))
/* This is the master Users and Groups config for the platform.
* DO NOT EVER RENUMBER
*/
@ -193,36 +182,4 @@
* Also see build/tools/fs_config for more details.
*/
#if !defined(EXCLUDE_FS_CONFIG_STRUCTURES)
struct fs_path_config {
unsigned mode;
unsigned uid;
unsigned gid;
uint64_t capabilities;
const char* prefix;
};
/* Rules for directories and files has moved to system/code/libcutils/fs_config.c */
__BEGIN_DECLS
/*
* Used in:
* build/tools/fs_config/fs_config.c
* build/tools/fs_get_stats/fs_get_stats.c
* system/extras/ext4_utils/make_ext4fs_main.c
* external/squashfs-tools/squashfs-tools/android.c
* system/core/cpio/mkbootfs.c
* system/core/adb/file_sync_service.cpp
* system/extras/ext4_utils/canned_fs_config.c
*/
void fs_config(const char* path, int dir, const char* target_out_path, unsigned* uid, unsigned* gid,
unsigned* mode, uint64_t* capabilities);
ssize_t fs_config_generate(char* buffer, size_t length, const struct fs_path_config* pc);
__END_DECLS
#endif
#endif

43
libcutils/include/private/fs_config.h
View File

@ -14,10 +14,24 @@
* limitations under the License.
*/
/* This file is used to define the properties of the filesystem
** images generated by build tools (mkbootfs and mkyaffs2image) and
** by the device side of adb.
*/
#ifndef _LIBS_CUTILS_PRIVATE_FS_CONFIG_H
#define _LIBS_CUTILS_PRIVATE_FS_CONFIG_H
#include <stdint.h>
#include <sys/cdefs.h>
#if defined(__BIONIC__)
#include <linux/capability.h>
#else // defined(__BIONIC__)
#include "android_filesystem_capability.h"
#endif // defined(__BIONIC__)
#define CAP_MASK_LONG(cap_name) (1ULL << (cap_name))
/*
* binary format for the runtime <partition>/etc/fs_config_(dirs|files)
@ -34,4 +48,33 @@ struct fs_path_config_from_file {
char prefix[];
} __attribute__((__aligned__(sizeof(uint64_t))));
struct fs_path_config {
unsigned mode;
unsigned uid;
unsigned gid;
uint64_t capabilities;
const char* prefix;
};
/* Rules for directories and files has moved to system/code/libcutils/fs_config.c */
__BEGIN_DECLS
/*
* Used in:
* build/tools/fs_config/fs_config.c
* build/tools/fs_get_stats/fs_get_stats.c
* system/extras/ext4_utils/make_ext4fs_main.c
* external/squashfs-tools/squashfs-tools/android.c
* system/core/cpio/mkbootfs.c
* system/core/adb/file_sync_service.cpp
* system/extras/ext4_utils/canned_fs_config.c
*/
void fs_config(const char* path, int dir, const char* target_out_path, unsigned* uid, unsigned* gid,
unsigned* mode, uint64_t* capabilities);
ssize_t fs_config_generate(char* buffer, size_t length, const struct fs_path_config* pc);
__END_DECLS
#endif /* _LIBS_CUTILS_PRIVATE_FS_CONFIG_H */

1
libcutils/include_vndk/cutils/android_filesystem_config.h Symbolic link
View File

@ -0,0 +1 @@
../../include/private/android_filesystem_config.h