tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "fs_config: include both oem ranges"

Browse source
This commit is contained in:
Treehugger Robot 2016-04-18 20:35:27 +00:00 committed by Gerrit Code Review
commit 27e0d48f0b
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/fs_config/README
View file

@ -90,7 +90,10 @@ value:
It is an error to specify multiple sections with the same [AID_<name>]. Per the ini
specifications enforced by Pythons ConfigParser. It is also an error to specify
multiple sections with the same value option. It is also an error to specify a value
that is outside of the OEM range AID_OEM_RESERVED_START(2900) and AID_OEM_RESERVED_END(2999)
that is outside of the inclusive OEM ranges:
* AID_OEM_RESERVED_START(2900) - AID_OEM_RESERVED_END(2999)
* AID_OEM_RESERVED_2_START(5000) - AID_OEM_RESERVED_2_END(5999)
as defined by system/core/include/private/android_filesystem_config.h.
Ordering within the TARGET_FS_CONFIG_GEN files is not relevant. The paths for files are sorted

12
tools/fs_config/fs_config_generator.py
View file

@ -33,8 +33,10 @@ GENERIC_DEFINE = "#define %s\t%s"
FILE_COMMENT = '// Defined in file: \"%s\"'
# from system/core/include/private/android_filesystem_config.h
AID_OEM_RESERVED_START = 2900
AID_OEM_RESERVED_END = 2999
AID_OEM_RESERVED_RANGES = [
(2900, 2999),
(5000, 5999),
]
AID_MATCH = re.compile('AID_[a-zA-Z]+')
@ -52,9 +54,9 @@ def handle_aid(file_name, section_name, config, aids, seen_aids):
raise Exception(errmsg % ('Invalid "value", not a number, got: \"%s\"' % value))
# Values must be within OEM range
if (v < AID_OEM_RESERVED_START) or (v > AID_OEM_RESERVED_END):
s = '"value" not in valid range %d - %d, got: %s'
s = s % (AID_OEM_RESERVED_START, AID_OEM_RESERVED_END, value)
if not any(lower <= v <= upper for (lower, upper) in AID_OEM_RESERVED_RANGES):
s = '"value" not in valid range %s, got: %s'
s = s % (str(AID_OEM_RESERVED_RANGES), value)
raise Exception(errmsg % s)
# use the normalized int value in the dict and detect