Commit 1552a28e authored Jan 03, 2017 by Johan Redestig

fs_config: Fix oem range parsing

Addresses the following build error:
  "value" not in valid range [], got: 2901 for: "AID_ABC" file:\
  "device/somc/abc/config.fs"

that happens when parsing device/somc/abc/config.fs:
  [AID_ABC]
  value: 2901

The problem is that the AID.PREFIX is 'AID_' so the _OEM_RANGE
expression is searching for AID__OEM_RESERVED, which never
exists. Drop the extra '_'.

Change-Id: I8a1556731e14e49cef66e3e91121e4be23a308e0
Test: ./build/tools/fs_config/fs_config_generator.py fsconfig --aid-header=system/core/include/private/android_filesystem_config.h device/somc/abc/config.fs

parent 5f60b742

tools/fs_config/fs_config_generator.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -252,7 +252,7 @@ class AIDHeaderParser(object):
		_AID_DEFINE = re.compile(r'\s#define\s+%s.' % AID.PREFIX)
		_OEM_START_KW = 'START'
		_OEM_END_KW = 'END'
		_OEM_RANGE = re.compile('%s_OEM_RESERVED_[0-9]*_{0,1}(%s\|%s)' %
		_OEM_RANGE = re.compile('%sOEM_RESERVED_[0-9]*_{0,1}(%s\|%s)' %
		(AID.PREFIX, _OEM_START_KW, _OEM_END_KW))
		# AID lines cannot end with _START or _END, ie AID_FOO is OK
		# but AID_FOO_START is skiped. Note that AID_FOOSTART is NOT skipped.