8130c482ab
construct_context.py is a script that runs at Ninja stage and constructs class loader context arguments for dex2oat. Previously it accepted lists of library paths and concatenated them into one class loader context string. The script also handled the dependency of "android.hidl.manager" on "android.hidl.base" that is not tracked by the build system and must be handled in a special way. Now that class loader context representation is going to change from flat lists to trees, passing paths to individual libraries as script arguments is no longer possible, because a list of paths cannot represent a class loader context tree. Passing the trees in a serialized form is also inconvenient, because the script would have to parse them, which would complicate it a lot. Therefore this patch ports all the concatenation and "android.hidl.base" handling to Soong. It is not possible to port the remaining script to Soong because Soong has no information about the targetSdkVersiion of the dexpreopted apps (it is in the manifest and sometimes in an APK, and has to be extracted at Ninja time). Test: construct_context_test.py Test: new subtests in TestUsesLibs Test: lunch aosp_cf_x86_phone-userdebug && m Bug: 132357300 Change-Id: Icdb03cf00d1e27e4cff3844b89bfaec4de502dd7
75 lines
2.7 KiB
Python
Executable file
75 lines
2.7 KiB
Python
Executable file
#!/usr/bin/env python
|
|
#
|
|
# Copyright (C) 2020 The Android Open Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
"""Unit tests for construct_context.py."""
|
|
|
|
import sys
|
|
import unittest
|
|
|
|
import construct_context as cc
|
|
|
|
sys.dont_write_bytecode = True
|
|
|
|
def construct_contexts(arglist):
|
|
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]',
|
|
]
|
|
|
|
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_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)
|
|
|
|
if __name__ == '__main__':
|
|
unittest.main(verbosity=2)
|