diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/construct_context.py | 97 | ||||
| -rwxr-xr-x | scripts/construct_context_test.py | 90 | ||||
| -rw-r--r-- | scripts/conv_linker_config.py | 293 | ||||
| -rwxr-xr-x | scripts/get_clang_version.py | 2 |
4 files changed, 258 insertions, 224 deletions
diff --git a/scripts/construct_context.py b/scripts/construct_context.py index f0658baa2..3f601c308 100755 --- a/scripts/construct_context.py +++ b/scripts/construct_context.py @@ -25,57 +25,78 @@ from manifest import compare_version_gt def parse_args(args): - """Parse commandline arguments.""" - parser = argparse.ArgumentParser() - parser.add_argument('--target-sdk-version', default='', dest='sdk', - help='specify target SDK version (as it appears in the manifest)') - parser.add_argument('--host-context-for-sdk', dest='host_contexts', - action='append', nargs=2, metavar=('sdk','context'), - help='specify context on host for a given SDK version or "any" version') - parser.add_argument('--target-context-for-sdk', dest='target_contexts', - action='append', nargs=2, metavar=('sdk','context'), - help='specify context on target for a given SDK version or "any" version') - return parser.parse_args(args) + """Parse commandline arguments.""" + parser = argparse.ArgumentParser() + parser.add_argument( + '--target-sdk-version', + default='', + dest='sdk', + help='specify target SDK version (as it appears in the manifest)') + parser.add_argument( + '--host-context-for-sdk', + dest='host_contexts', + action='append', + nargs=2, + metavar=('sdk', 'context'), + help='specify context on host for a given SDK version or "any" version') + parser.add_argument( + '--target-context-for-sdk', + dest='target_contexts', + action='append', + nargs=2, + metavar=('sdk', 'context'), + help='specify context on target for a given SDK version or "any" ' + 'version' + ) + return parser.parse_args(args) + # Special keyword that means that the context should be added to class loader # context regardless of the target SDK version. any_sdk = 'any' + # We assume that the order of context arguments passed to this script is # correct (matches the order computed by package manager). It is possible to # sort them here, but Soong needs to use deterministic order anyway, so it can # as well use the correct order. def construct_context(versioned_contexts, target_sdk): - context = [] - for [sdk, ctx] in versioned_contexts: - if sdk == any_sdk or compare_version_gt(sdk, target_sdk): - context.append(ctx) - return context + context = [] + for [sdk, ctx] in versioned_contexts: + if sdk == any_sdk or compare_version_gt(sdk, target_sdk): + context.append(ctx) + return context + def construct_contexts(args): - host_context = construct_context(args.host_contexts, args.sdk) - target_context = construct_context(args.target_contexts, args.sdk) - context_sep = '#' - return ('class_loader_context_arg=--class-loader-context=PCL[]{%s} ; ' % context_sep.join(host_context) + - 'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{%s}' % context_sep.join(target_context)) + host_context = construct_context(args.host_contexts, args.sdk) + target_context = construct_context(args.target_contexts, args.sdk) + context_sep = '#' + return ( + 'class_loader_context_arg=--class-loader-context=PCL[]{%s} ; ' % + context_sep.join(host_context) + + 'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{%s}' #pylint: disable=line-too-long + % context_sep.join(target_context)) + def main(): - """Program entry point.""" - try: - args = parse_args(sys.argv[1:]) - if not args.sdk: - raise SystemExit('target sdk version is not set') - if not args.host_contexts: - args.host_contexts = [] - if not args.target_contexts: - args.target_contexts = [] - - print(construct_contexts(args)) - - # pylint: disable=broad-except - except Exception as err: - print('error: ' + str(err), file=sys.stderr) - sys.exit(-1) + """Program entry point.""" + try: + args = parse_args(sys.argv[1:]) + if not args.sdk: + raise SystemExit('target sdk version is not set') + if not args.host_contexts: + args.host_contexts = [] + if not args.target_contexts: + args.target_contexts = [] + + print(construct_contexts(args)) + + # pylint: disable=broad-except + except Exception as err: + print('error: ' + str(err), file=sys.stderr) + sys.exit(-1) + if __name__ == '__main__': - main() + main() diff --git a/scripts/construct_context_test.py b/scripts/construct_context_test.py index 3b05f9013..2ff5ac54a 100755 --- a/scripts/construct_context_test.py +++ b/scripts/construct_context_test.py @@ -23,53 +23,63 @@ import construct_context as cc sys.dont_write_bytecode = True + def construct_contexts(arglist): - args = cc.parse_args(arglist) - return cc.construct_contexts(args) + args = cc.parse_args(arglist) + return cc.construct_contexts(args) + contexts = [ - '--host-context-for-sdk', '28', 'PCL[out/zdir/z.jar]', - '--target-context-for-sdk', '28', 'PCL[/system/z.jar]', - '--host-context-for-sdk', '29', 'PCL[out/xdir/x.jar]#PCL[out/ydir/y.jar]', - '--target-context-for-sdk', '29', 'PCL[/system/x.jar]#PCL[/product/y.jar]', - '--host-context-for-sdk', 'any', 'PCL[out/adir/a.jar]#PCL[out/bdir/b.jar]', - '--target-context-for-sdk', 'any', 'PCL[/system/a.jar]#PCL[/product/b.jar]', + '--host-context-for-sdk', + '28', + 'PCL[out/zdir/z.jar]', + '--target-context-for-sdk', + '28', + 'PCL[/system/z.jar]', + '--host-context-for-sdk', + '29', + 'PCL[out/xdir/x.jar]#PCL[out/ydir/y.jar]', + '--target-context-for-sdk', + '29', + 'PCL[/system/x.jar]#PCL[/product/y.jar]', + '--host-context-for-sdk', + 'any', + 'PCL[out/adir/a.jar]#PCL[out/bdir/b.jar]', + '--target-context-for-sdk', + 'any', + 'PCL[/system/a.jar]#PCL[/product/b.jar]', ] +#pylint: disable=line-too-long class ConstructContextTest(unittest.TestCase): - def test_construct_context_28(self): - args = ['--target-sdk-version', '28'] + contexts - result = construct_contexts(args) - expect = ('class_loader_context_arg=--class-loader-context=PCL[]{PCL[out/xdir/x.jar]' - '#PCL[out/ydir/y.jar]' - '#PCL[out/adir/a.jar]' - '#PCL[out/bdir/b.jar]}' - ' ; ' - 'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{PCL[/system/x.jar]' - '#PCL[/product/y.jar]' - '#PCL[/system/a.jar]' - '#PCL[/product/b.jar]}') - self.assertEqual(result, expect) - def test_construct_context_29(self): - args = ['--target-sdk-version', '29'] + contexts - result = construct_contexts(args) - expect = ('class_loader_context_arg=--class-loader-context=PCL[]{PCL[out/adir/a.jar]' - '#PCL[out/bdir/b.jar]}' - ' ; ' - 'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{PCL[/system/a.jar]' - '#PCL[/product/b.jar]}') - self.assertEqual(result, expect) + def test_construct_context_28(self): + args = ['--target-sdk-version', '28'] + contexts + result = construct_contexts(args) + expect = ( + 'class_loader_context_arg=--class-loader-context=PCL[]{PCL[out/xdir/x.jar]#PCL[out/ydir/y.jar]#PCL[out/adir/a.jar]#PCL[out/bdir/b.jar]}' + ' ; ' + 'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{PCL[/system/x.jar]#PCL[/product/y.jar]#PCL[/system/a.jar]#PCL[/product/b.jar]}') + self.assertEqual(result, expect) + + def test_construct_context_29(self): + args = ['--target-sdk-version', '29'] + contexts + result = construct_contexts(args) + expect = ( + 'class_loader_context_arg=--class-loader-context=PCL[]{PCL[out/adir/a.jar]#PCL[out/bdir/b.jar]}' + ' ; ' + 'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{PCL[/system/a.jar]#PCL[/product/b.jar]}') + self.assertEqual(result, expect) - def test_construct_context_S(self): - args = ['--target-sdk-version', 'S'] + contexts - result = construct_contexts(args) - expect = ('class_loader_context_arg=--class-loader-context=PCL[]{PCL[out/adir/a.jar]' - '#PCL[out/bdir/b.jar]}' - ' ; ' - 'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{PCL[/system/a.jar]' - '#PCL[/product/b.jar]}') - self.assertEqual(result, expect) + def test_construct_context_S(self): + args = ['--target-sdk-version', 'S'] + contexts + result = construct_contexts(args) + expect = ( + 'class_loader_context_arg=--class-loader-context=PCL[]{PCL[out/adir/a.jar]#PCL[out/bdir/b.jar]}' + ' ; ' + 'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{PCL[/system/a.jar]#PCL[/product/b.jar]}') + self.assertEqual(result, expect) +#pylint: enable=line-too-long if __name__ == '__main__': - unittest.main(verbosity=2) + unittest.main(verbosity=2) diff --git a/scripts/conv_linker_config.py b/scripts/conv_linker_config.py index 92f79dae8..e46efe494 100644 --- a/scripts/conv_linker_config.py +++ b/scripts/conv_linker_config.py @@ -20,178 +20,181 @@ import collections import json import os -import linker_config_pb2 +import linker_config_pb2 #pylint: disable=import-error from google.protobuf.descriptor import FieldDescriptor from google.protobuf.json_format import ParseDict from google.protobuf.text_format import MessageToString def Proto(args): - json_content = '' - with open(args.source) as f: - 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()) + json_content = '' + with open(args.source) as f: + 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()) def Print(args): - with open(args.source, 'rb') as f: - pb = linker_config_pb2.LinkerConfig() - pb.ParseFromString(f.read()) - print(MessageToString(pb)) + with open(args.source, 'rb') as f: + pb = linker_config_pb2.LinkerConfig() + pb.ParseFromString(f.read()) + print(MessageToString(pb)) def SystemProvide(args): - pb = linker_config_pb2.LinkerConfig() - with open(args.source, 'rb') as f: - pb.ParseFromString(f.read()) - libraries = args.value.split() + pb = linker_config_pb2.LinkerConfig() + with open(args.source, 'rb') as f: + pb.ParseFromString(f.read()) + libraries = args.value.split() - def IsInLibPath(lib_name): - lib_path = os.path.join(args.system, 'lib', lib_name) - lib64_path = os.path.join(args.system, 'lib64', lib_name) - return os.path.exists(lib_path) or os.path.islink(lib_path) or os.path.exists(lib64_path) or os.path.islink(lib64_path) + def IsInLibPath(lib_name): + lib_path = os.path.join(args.system, 'lib', lib_name) + lib64_path = os.path.join(args.system, 'lib64', lib_name) + return os.path.exists(lib_path) or os.path.islink( + lib_path) or os.path.exists(lib64_path) or os.path.islink( + lib64_path) - installed_libraries = list(filter(IsInLibPath, libraries)) - for item in installed_libraries: - if item not in getattr(pb, 'provideLibs'): - getattr(pb, 'provideLibs').append(item) - with open(args.output, 'wb') as f: - f.write(pb.SerializeToString()) + installed_libraries = [lib for lib in libraries if IsInLibPath(lib)] + for item in installed_libraries: + if item not in getattr(pb, 'provideLibs'): + getattr(pb, 'provideLibs').append(item) + with open(args.output, 'wb') as f: + f.write(pb.SerializeToString()) def Append(args): - pb = linker_config_pb2.LinkerConfig() - with open(args.source, 'rb') as f: - pb.ParseFromString(f.read()) + pb = linker_config_pb2.LinkerConfig() + with open(args.source, 'rb') as f: + pb.ParseFromString(f.read()) - if getattr(type(pb), args.key).DESCRIPTOR.label == FieldDescriptor.LABEL_REPEATED: - for value in args.value.split(): - getattr(pb, args.key).append(value) - else: - setattr(pb, args.key, args.value) + if getattr(type(pb), + args.key).DESCRIPTOR.label == FieldDescriptor.LABEL_REPEATED: + for value in args.value.split(): + getattr(pb, args.key).append(value) + else: + setattr(pb, args.key, args.value) + + with open(args.output, 'wb') as f: + f.write(pb.SerializeToString()) - with open(args.output, 'wb') as f: - f.write(pb.SerializeToString()) def Merge(args): - pb = linker_config_pb2.LinkerConfig() - for other in args.input: - with open(other, 'rb') as f: - pb.MergeFromString(f.read()) + pb = linker_config_pb2.LinkerConfig() + for other in args.input: + with open(other, 'rb') as f: + pb.MergeFromString(f.read()) + + with open(args.out, 'wb') as f: + f.write(pb.SerializeToString()) - with open(args.out, 'wb') as f: - f.write(pb.SerializeToString()) def GetArgParser(): - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers() - - parser_proto = subparsers.add_parser( - 'proto', help='Convert the input JSON configuration file into protobuf.') - parser_proto.add_argument( - '-s', - '--source', - required=True, - type=str, - help='Source linker configuration file in JSON.') - parser_proto.add_argument( - '-o', - '--output', - required=True, - type=str, - help='Target path to create protobuf file.') - parser_proto.set_defaults(func=Proto) - - print_proto = subparsers.add_parser( - 'print', help='Print configuration in human-readable text format.') - print_proto.add_argument( - '-s', - '--source', - required=True, - type=str, - help='Source linker configuration file in protobuf.') - print_proto.set_defaults(func=Print) - - system_provide_libs = subparsers.add_parser( - 'systemprovide', help='Append system provide libraries into the configuration.') - system_provide_libs.add_argument( - '-s', - '--source', - required=True, - type=str, - help='Source linker configuration file in protobuf.') - system_provide_libs.add_argument( - '-o', - '--output', - required=True, - type=str, - help='Target linker configuration file to write in protobuf.') - system_provide_libs.add_argument( - '--value', - required=True, - type=str, - help='Values of the libraries to append. If there are more than one it should be separated by empty space') - system_provide_libs.add_argument( - '--system', - required=True, - type=str, - help='Path of the system image.') - system_provide_libs.set_defaults(func=SystemProvide) - - append = subparsers.add_parser( - 'append', help='Append value(s) to given key.') - append.add_argument( - '-s', - '--source', - required=True, - type=str, - help='Source linker configuration file in protobuf.') - append.add_argument( - '-o', - '--output', - required=True, - type=str, - help='Target linker configuration file to write in protobuf.') - append.add_argument( - '--key', - required=True, - type=str, - help='.') - append.add_argument( - '--value', - required=True, - type=str, - help='Values of the libraries to append. If there are more than one it should be separated by empty space') - append.set_defaults(func=Append) - - append = subparsers.add_parser( - 'merge', help='Merge configurations') - append.add_argument( - '-o', - '--out', - required=True, - type=str, - help='Ouptut linker configuration file to write in protobuf.') - append.add_argument( - '-i', - '--input', - nargs='+', - type=str, - help='Linker configuration files to merge.') - append.set_defaults(func=Merge) - - return parser + parser = argparse.ArgumentParser() + subparsers = parser.add_subparsers() + + parser_proto = subparsers.add_parser( + 'proto', + help='Convert the input JSON configuration file into protobuf.') + parser_proto.add_argument( + '-s', + '--source', + required=True, + type=str, + help='Source linker configuration file in JSON.') + parser_proto.add_argument( + '-o', + '--output', + required=True, + type=str, + help='Target path to create protobuf file.') + parser_proto.set_defaults(func=Proto) + + print_proto = subparsers.add_parser( + 'print', help='Print configuration in human-readable text format.') + print_proto.add_argument( + '-s', + '--source', + required=True, + type=str, + help='Source linker configuration file in protobuf.') + print_proto.set_defaults(func=Print) + + system_provide_libs = subparsers.add_parser( + 'systemprovide', + help='Append system provide libraries into the configuration.') + system_provide_libs.add_argument( + '-s', + '--source', + required=True, + type=str, + help='Source linker configuration file in protobuf.') + system_provide_libs.add_argument( + '-o', + '--output', + required=True, + type=str, + help='Target linker configuration file to write in protobuf.') + system_provide_libs.add_argument( + '--value', + required=True, + type=str, + help='Values of the libraries to append. If there are more than one ' + 'it should be separated by empty space' + ) + system_provide_libs.add_argument( + '--system', required=True, type=str, help='Path of the system image.') + system_provide_libs.set_defaults(func=SystemProvide) + + append = subparsers.add_parser( + 'append', help='Append value(s) to given key.') + append.add_argument( + '-s', + '--source', + required=True, + type=str, + help='Source linker configuration file in protobuf.') + append.add_argument( + '-o', + '--output', + required=True, + type=str, + help='Target linker configuration file to write in protobuf.') + append.add_argument('--key', required=True, type=str, help='.') + append.add_argument( + '--value', + required=True, + type=str, + help='Values of the libraries to append. If there are more than one' + 'it should be separated by empty space' + ) + append.set_defaults(func=Append) + + append = subparsers.add_parser('merge', help='Merge configurations') + append.add_argument( + '-o', + '--out', + required=True, + type=str, + help='Output linker configuration file to write in protobuf.') + append.add_argument( + '-i', + '--input', + nargs='+', + type=str, + help='Linker configuration files to merge.') + append.set_defaults(func=Merge) + + return parser def main(): - args = GetArgParser().parse_args() - args.func(args) + args = GetArgParser().parse_args() + args.func(args) if __name__ == '__main__': - main() + main() diff --git a/scripts/get_clang_version.py b/scripts/get_clang_version.py index f6efc5f82..17bc88bbd 100755 --- a/scripts/get_clang_version.py +++ b/scripts/get_clang_version.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2021 The Android Open Source Project # |