Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7217e28 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "fs_config: Fix oem range parsing" am: ce6c8e62 

am: c16a64b8

Change-Id: Iafb13daaa210eea2c19e11eb1d9b2d94a5d047bb
parents 085daa64 c16a64b8

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.