diff options
| author | Thierry Strudel <tstrudel@google.com> | 2015-07-09 09:50:31 -0700 |
|---|---|---|
| committer | Thierry Strudel <tstrudel@google.com> | 2015-07-09 21:47:07 -0700 |
| commit | df33ffadd29ed02d87e87515626b673eac67f735 (patch) | |
| tree | 977968b729fc9fc38859633f12d23dd9f4ba02be /include/private | |
| parent | eb528dd5a152d66216b9a2793a3619a65411950c (diff) | |
| download | system_core-df33ffadd29ed02d87e87515626b673eac67f735.zip system_core-df33ffadd29ed02d87e87515626b673eac67f735.tar.gz system_core-df33ffadd29ed02d87e87515626b673eac67f735.tar.bz2 | |
fs_config: replace getenv('OUT') by new fs_config parameter
Using a getenv('OUT') in such a deep down function is a wrong design
choice. Replacing with explicit parameter that may be NULL in case
device specific files can be accessed from /.
Since TARGET_COPY_OUT_SYSTEM may be defined to something different than
system we also ensure that we use a path relative to TARGET_OUT to
compute path to fs_config_* files.
Bug: 21989305
Bug: 22048934
Change-Id: Id91bc183b29beac7379d1117ad83bd3346e6897b
Signed-off-by: Thierry Strudel <tstrudel@google.com>
Diffstat (limited to 'include/private')
| -rw-r--r-- | include/private/android_filesystem_config.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h index 02fe2b5..2ed27dc 100644 --- a/include/private/android_filesystem_config.h +++ b/include/private/android_filesystem_config.h @@ -206,13 +206,13 @@ __BEGIN_DECLS * Used in: * build/tools/fs_config/fs_config.c * build/tools/fs_get_stats/fs_get_stats.c - * external/genext2fs/genext2fs.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, +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); |