commit 5f997265504abf4eefc392b547369e6839a3465d
author Treehugger Robot <treehugger-gerrit@google.com> Tue Nov 03 12:46:50 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 03 12:46:50 2020 +0000
tree c8bfefe7e5443f7dbdd8b1fc4de1ab9a71756af9
parent 366c7d3a74d13b86122309a4710a30eda026e5f1
parent e52c665d7fec4924096c1899ce95487ed4a21d7b

Merge "Allow comments from linker.config.json"

scripts/conv_linker_config.py

diff --git a/scripts/conv_linker_config.py b/scripts/conv_linker_config.py
index 86f788d..81425fb 100644
--- a/scripts/conv_linker_config.py
+++ b/scripts/conv_linker_config.py
@@ -25,8 +25,12 @@
 
 
 def Proto(args):
+  json_content = ''
   with open(args.source) as f:
-    obj = json.load(f, object_pairs_hook=collections.OrderedDict)
+    for line in f:
+      if not line.lstrip().startswith('//'):
+        json_content += line
+  obj = json.loads(json_content, object_pairs_hook=collections.OrderedDict)
   pb = ParseDict(obj, linker_config_pb2.LinkerConfig())
   with open(args.output, 'wb') as f:
     f.write(pb.SerializeToString())