Merge "fs_config: include both oem ranges" (27e0d48f) · Commits · e / os / android_build

tools/fs_config/README

+4 −1

Original line number	Diff line number	Diff line
		@@ -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

+7 −5

Original line number	Diff line number	Diff line
		@@ -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