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

Merge "JSON format doesn't support comments, so a JSONWithCommentsDecoder is added to support line comments start with // that used in apex_manifest.json files. This fixes the CI errors reported in b/238399517."

Browse source
This commit is contained in:
Treehugger Robot 2022-07-11 17:45:18 +00:00 committed by Gerrit Code Review
commit 8322200372
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/jsonmodify.py
View file

@ -75,6 +75,14 @@ class AppendList(str):
raise ValueError(self + " should be a array.")
cur[key].extend(args)
# A JSONDecoder that supports line comments start with //
class JSONWithCommentsDecoder(json.JSONDecoder):
def __init__(self, **kw):
super().__init__(**kw)
def decode(self, s: str):
s = '\n'.join(l for l in s.split('\n') if not l.lstrip(' ').startswith('//'))
return super().decode(s)
def main():
parser = argparse.ArgumentParser()
@ -103,9 +111,9 @@ def main():
if args.input:
with open(args.input) as f:
obj = json.load(f, object_pairs_hook=collections.OrderedDict)
obj = json.load(f, object_pairs_hook=collections.OrderedDict, cls=JSONWithCommentsDecoder)
else:
obj = json.load(sys.stdin, object_pairs_hook=collections.OrderedDict)
obj = json.load(sys.stdin, object_pairs_hook=collections.OrderedDict, cls=JSONWithCommentsDecoder)
for p in args.patch:
p[0].apply(obj, *p[1:])