Merge "libcutils: create private/fs_config.h" into oc-dev
This commit is contained in:
commit
40ed56c70b
2 changed files with 38 additions and 10 deletions
|
@ -35,22 +35,13 @@
|
|||
|
||||
#include <log/log.h>
|
||||
#include <private/android_filesystem_config.h>
|
||||
#include <private/fs_config.h>
|
||||
#include <utils/Compat.h>
|
||||
|
||||
#ifndef O_BINARY
|
||||
#define O_BINARY 0
|
||||
#endif
|
||||
|
||||
/* The following structure is stored little endian */
|
||||
struct fs_path_config_from_file {
|
||||
uint16_t len;
|
||||
uint16_t mode;
|
||||
uint16_t uid;
|
||||
uint16_t gid;
|
||||
uint64_t capabilities;
|
||||
char prefix[];
|
||||
} __attribute__((__aligned__(sizeof(uint64_t))));
|
||||
|
||||
/* My kingdom for <endian.h> */
|
||||
static inline uint16_t get2LE(const uint8_t* src) { return src[0] | (src[1] << 8); }
|
||||
|
||||
|
|
37
libcutils/include/private/fs_config.h
Normal file
37
libcutils/include/private/fs_config.h
Normal file
|
@ -0,0 +1,37 @@
|
|||
/*
|
||||
* Copyright (C) 2007 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#ifndef _LIBS_CUTILS_PRIVATE_FS_CONFIG_H
|
||||
#define _LIBS_CUTILS_PRIVATE_FS_CONFIG_H
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
/*
|
||||
* binary format for the runtime <partition>/etc/fs_config_(dirs|files)
|
||||
* filesystem override files.
|
||||
*/
|
||||
|
||||
/* The following structure is stored little endian */
|
||||
struct fs_path_config_from_file {
|
||||
uint16_t len;
|
||||
uint16_t mode;
|
||||
uint16_t uid;
|
||||
uint16_t gid;
|
||||
uint64_t capabilities;
|
||||
char prefix[];
|
||||
} __attribute__((__aligned__(sizeof(uint64_t))));
|
||||
|
||||
#endif /* _LIBS_CUTILS_PRIVATE_FS_CONFIG_H */
|
Loading…
Reference in a new issue