StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "conv_linker_config proto works with empty input" am: 6bc5e2cefa am: f432b44ddd

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470881

Change-Id: I3fdcd8237808619fad34c3a852556ac283655031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-03-06 19:48:04 +00:00
committed by Automerger Merge Worker
parent 8ab4bf80f1 f432b44ddd
commit 4800985881
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/conv_linker_config.py
View File

@@ -28,6 +28,7 @@ from google.protobuf.text_format import MessageToString
def Proto(args): def Proto(args):
pb = linker_config_pb2.LinkerConfig() pb = linker_config_pb2.LinkerConfig()
if args.source:
for input in args.source.split(':'): for input in args.source.split(':'):
json_content = '' json_content = ''
with open(input) as f: with open(input) as f:
@@ -104,7 +105,7 @@ def GetArgParser():
parser_proto.add_argument( parser_proto.add_argument(
'-s', '-s',
'--source', '--source',
required=True, nargs='?',
type=str, type=str,
help='Colon-separated list of linker configuration files in JSON.') help='Colon-separated list of linker configuration files in JSON.')
parser_proto.add_argument( parser_proto.add_argument(