Merge "conv_linker_config proto works with empty input"

scripts/conv_linker_config.py

@@ -28,14 +28,15 @@ from google.protobuf.text_format import MessageToString
 
 def Proto(args):
     pb = linker_config_pb2.LinkerConfig()
-    for input in args.source.split(':'):
+    if args.source:
-        json_content = ''
+        for input in args.source.split(':'):
-        with open(input) as f:
+            json_content = ''
-            for line in f:
+            with open(input) as f:
-                if not line.lstrip().startswith('//'):
+                for line in f:
-                    json_content += line
+                    if not line.lstrip().startswith('//'):
-        obj = json.loads(json_content, object_pairs_hook=collections.OrderedDict)
+                        json_content += line
-        ParseDict(obj, pb)
+            obj = json.loads(json_content, object_pairs_hook=collections.OrderedDict)
+            ParseDict(obj, pb)
     with open(args.output, 'wb') as f:
         f.write(pb.SerializeToString())
 
@@ -104,7 +105,7 @@ def GetArgParser():
     parser_proto.add_argument(
         '-s',
         '--source',
-        required=True,
+        nargs='?',
         type=str,
         help='Colon-separated list of linker configuration files in JSON.')
     parser_proto.add_argument(