p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "fs_config: remove empty fs_config_* automation." am: c8b3d5f92f 

am: 10d6aab12c

Change-Id: I1cb553fa10db427f8dc41c88d43bcbd5c3fe5864
This commit is contained in:
Mark Salyzyn 2018-12-12 13:51:02 -08:00 committed by android-build-merger
parent ef9d004894 10d6aab12c
commit 2db5e766e8
2 changed files with 1 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/fs_config/fs_config_generate.c
View File

@ -41,22 +41,7 @@ static const struct fs_path_config android_device_dirs[] = { };
#endif
#ifdef NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_FILES
static const struct fs_path_config android_device_files[] = {
#ifdef NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS
{0000, AID_ROOT, AID_ROOT, 0, "system/etc/fs_config_dirs"},
{0000, AID_ROOT, AID_ROOT, 0, "vendor/etc/fs_config_dirs"},
{0000, AID_ROOT, AID_ROOT, 0, "oem/etc/fs_config_dirs"},
{0000, AID_ROOT, AID_ROOT, 0, "odm/etc/fs_config_dirs"},
{0000, AID_ROOT, AID_ROOT, 0, "product/etc/fs_config_dirs"},
{0000, AID_ROOT, AID_ROOT, 0, "product_services/etc/fs_config_dirs"},
#endif
{0000, AID_ROOT, AID_ROOT, 0, "system/etc/fs_config_files"},
{0000, AID_ROOT, AID_ROOT, 0, "vendor/etc/fs_config_files"},
{0000, AID_ROOT, AID_ROOT, 0, "oem/etc/fs_config_files"},
{0000, AID_ROOT, AID_ROOT, 0, "odm/etc/fs_config_files"},
{0000, AID_ROOT, AID_ROOT, 0, "product/etc/fs_config_files"},
{0000, AID_ROOT, AID_ROOT, 0, "product_services/etc/fs_config_files"},
};
static const struct fs_path_config android_device_files[] = { };
#endif
static void usage() {

22
tools/fs_config/fs_config_generator.py
View File

@ -909,22 +909,6 @@ class FSConfigGen(BaseGenerator):
'#warning No device-supplied android_filesystem_config.h,'
' using empty default.')
# Long names.
# pylint: disable=invalid-name
_NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS_ENTRY = (
'{ 00000, AID_ROOT, AID_ROOT, 0,'
'"system/etc/fs_config_dirs" },')
_NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_FILES_ENTRY = (
'{ 00000, AID_ROOT, AID_ROOT, 0,'
'"system/etc/fs_config_files" },')
_IFDEF_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS = (
'#ifdef NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS')
# pylint: enable=invalid-name
_ENDIF = '#endif'
_OPEN_FILE_STRUCT = (
'static const struct fs_path_config android_device_files[] = {')
@ -1082,12 +1066,6 @@ class FSConfigGen(BaseGenerator):
for fs_config in files:
self._to_fs_entry(fs_config)
if not are_dirs:
print FSConfigGen._IFDEF_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS
print(
' ' +
FSConfigGen._NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS_ENTRY)
print FSConfigGen._ENDIF
print FSConfigGen._CLOSE_FILE_STRUCT
if are_dirs: