diff options
Diffstat (limited to 'scripts/construct_context.py')
| -rwxr-xr-x | scripts/construct_context.py | 43 |
1 files changed, 17 insertions, 26 deletions
diff --git a/scripts/construct_context.py b/scripts/construct_context.py index 8717fe305..6f9edc429 100755 --- a/scripts/construct_context.py +++ b/scripts/construct_context.py @@ -29,41 +29,32 @@ def parse_args(args): 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-classpath-for-sdk', dest='host_classpaths', - action='append', nargs=2, metavar=('sdk','classpath'), - help='specify classpath on host for a given SDK version or "any" version') - parser.add_argument('--target-classpath-for-sdk', dest='target_classpaths', - action='append', nargs=2, metavar=('sdk','classpath'), - help='specify classpath on target for a given SDK version or "any" version') + 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) -# The hidl.manager shared library has a dependency on hidl.base. We manually -# add that information to the class loader context if we see those libraries. -HIDL_MANAGER = 'android.hidl.manager-V1.0-java' -HIDL_BASE = 'android.hidl.base-V1.0-java' - -# Special keyword that means that the classpath should be added to class loader +# 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 classpath arguments passed to this script is +# 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_classpaths, target_sdk): +def construct_context(versioned_contexts, target_sdk): context = [] - for [sdk, classpath] in versioned_classpaths: + for [sdk, ctx] in versioned_contexts: if sdk == any_sdk or compare_version_gt(sdk, target_sdk): - for jar in classpath.split(':'): - pcl = 'PCL[%s]' % jar - if HIDL_MANAGER in jar: - pcl += '{PCL[%s]}' % jar.replace(HIDL_MANAGER, HIDL_BASE, 1) - context.append(pcl) + context.append(ctx) return context def construct_contexts(args): - host_context = construct_context(args.host_classpaths, args.sdk) - target_context = construct_context(args.target_classpaths, args.sdk) + 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)) @@ -74,10 +65,10 @@ def main(): args = parse_args(sys.argv[1:]) if not args.sdk: raise SystemExit('target sdk version is not set') - if not args.host_classpaths: - raise SystemExit('host classpath is not set') - if not args.target_classpaths: - raise SystemExit('target classpath is not set') + if not args.host_contexts: + raise SystemExit('host context is not set') + if not args.target_contexts: + raise SystemExit('target context is not set') print(construct_contexts(args)) |