tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
platform_build_soong/scripts/construct_context_test.py
Jiakai Zhang a449678996 Move CLC construction to Ninja phase. 
Before this change, dexpreopt was often broken with optional libraries.
This was because the CLC construction was done in Soong at an early
stage, where we don't have sufficient information to determine whether
an optional library is installed or not.

For example, the "Settings" package uses an optional library called
"androidx.window.extensions". On some devices, the library is installed,
but on some other devices, it's not. Soong always adds the library to
the CLC, meaning the CLC is wrong for devices which don't have the
library. This change fixes the problem. See the tests below.

After this change, the CLC construction is done by a Python script
invoked at a very late stage. It uses product_packages.txt, which is
generated by Make, to determine whether an optional library is
installed or not, and filter out libraries that are not installed.

Note that optional libraries are still added as dependencies by Soong.
This is because dependencies have to be added at an early stage. This
means what dex2oat eventually uses will be a subset of the dependencies,
which is fine.

Bug: 282877248
Test: m
Test: atest construct_context_test
Test: -
  1. lunch aosp_cf_x86_64_phone-userdebug && m
  2. Check the .invocation file of the "Settings" package (defined in
     .bp file)
  3. See androidx.window.extensions
Test: -
  1. lunch aosp_redfin-userdebug && m
  2. Check the .invocation file of the "Settings" package (defined in
     .bp file)
  3. Don't see androidx.window.extensions
Test: Check the .invocation file of the "Dialer" package (defined in
  .mk file)
Test: -
  1. Build a Pixel 5 system image and flash it to a Pixel 5 device.
  2. adb shell pm art dump
  3. See "reason=prebuilt" instead of "reason=vdex".
     (https://diff.googleplex.com/#key=fB6Ls9q2QGSN, before: left,
     after: right)

Change-Id: Ia112bd7c2328373e68db6bffb74bf34030f683d8
2023-05-30 15:46:38 +01:00

272 lines
8.4 KiB
Python
Executable file
Raw Blame History

#!/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
CONTEXT_JSON = {
'28': [
{
'Name': 'z',
'Optional': False,
'Host': 'out/zdir/z.jar',
'Device': '/system/z.jar',
'Subcontexts': [],
},
],
'29': [
{
'Name': 'x',
'Optional': False,
'Host': 'out/xdir/x.jar',
'Device': '/system/x.jar',
'Subcontexts': [],
},
{
'Name': 'y',
'Optional': False,
'Host': 'out/ydir/y.jar',
'Device': '/product/y.jar',
'Subcontexts': [],
},
],
'any': [
{
'Name': 'a',
'Optional': False,
'Host': 'out/adir/a.jar',
'Device': '/system/a.jar',
'Subcontexts': [
{ # Not installed optional, being the only child.
'Name': 'a1',
'Optional': True,
'Host': 'out/a1dir/a1.jar',
'Device': '/product/a1.jar',
'Subcontexts': [],
},
],
},
{
'Name': 'b',
'Optional': True,
'Host': 'out/bdir/b.jar',
'Device': '/product/b.jar',
'Subcontexts': [
{ # Not installed but required.
'Name': 'b1',
'Optional': False,
'Host': 'out/b1dir/b1.jar',
'Device': '/product/b1.jar',
'Subcontexts': [],
},
{ # Installed optional.
'Name': 'b2',
'Optional': True,
'Host': 'out/b2dir/b2.jar',
'Device': '/product/b2.jar',
'Subcontexts': [],
},
{ # Not installed optional.
'Name': 'b3',
'Optional': True,
'Host': 'out/b3dir/b3.jar',
'Device': '/product/b3.jar',
'Subcontexts': [],
},
{ # Installed optional with one more level of nested deps.
'Name': 'b4',
'Optional': True,
'Host': 'out/b4dir/b4.jar',
'Device': '/product/b4.jar',
'Subcontexts': [
{
'Name': 'b41',
'Optional': True,
'Host': 'out/b41dir/b41.jar',
'Device': '/product/b41.jar',
'Subcontexts': [],
},
{
'Name': 'b42',
'Optional': True,
'Host': 'out/b42dir/b42.jar',
'Device': '/product/b42.jar',
'Subcontexts': [],
},
],
},
],
},
{ # Not installed optional, at the top-level.
'Name': 'c',
'Optional': True,
'Host': 'out/cdir/c.jar',
'Device': '/product/c.jar',
'Subcontexts': [],
},
],
}
PRODUCT_PACKAGES = ['a', 'b', 'b2', 'b4', 'b41', 'b42', 'x', 'y', 'z']
def construct_context_args(target_sdk):
return cc.construct_context_args(target_sdk, CONTEXT_JSON, PRODUCT_PACKAGES)
class ConstructContextTest(unittest.TestCase):
def test_construct_context_27(self):
actual = construct_context_args('27')
# The order matters.
expected = (
'class_loader_context_arg='
'--class-loader-context=PCL[]{'
'PCL[out/xdir/x.jar]#'
'PCL[out/ydir/y.jar]#'
'PCL[out/zdir/z.jar]#'
'PCL[out/adir/a.jar]#'
'PCL[out/bdir/b.jar]{'
'PCL[out/b1dir/b1.jar]#'
'PCL[out/b2dir/b2.jar]#'
'PCL[out/b4dir/b4.jar]{'
'PCL[out/b41dir/b41.jar]#'
'PCL[out/b42dir/b42.jar]'
'}'
'}'
'}'
' ; '
'stored_class_loader_context_arg='
'--stored-class-loader-context=PCL[]{'
'PCL[/system/x.jar]#'
'PCL[/product/y.jar]#'
'PCL[/system/z.jar]#'
'PCL[/system/a.jar]#'
'PCL[/product/b.jar]{'
'PCL[/product/b1.jar]#'
'PCL[/product/b2.jar]#'
'PCL[/product/b4.jar]{'
'PCL[/product/b41.jar]#'
'PCL[/product/b42.jar]'
'}'
'}'
'}')
self.assertEqual(actual, expected)
def test_construct_context_28(self):
actual = construct_context_args('28')
expected = (
'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]{'
'PCL[out/b1dir/b1.jar]#'
'PCL[out/b2dir/b2.jar]#'
'PCL[out/b4dir/b4.jar]{'
'PCL[out/b41dir/b41.jar]#'
'PCL[out/b42dir/b42.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]{'
'PCL[/product/b1.jar]#'
'PCL[/product/b2.jar]#'
'PCL[/product/b4.jar]{'
'PCL[/product/b41.jar]#'
'PCL[/product/b42.jar]'
'}'
'}'
'}')
self.assertEqual(actual, expected)
def test_construct_context_29(self):
actual = construct_context_args('29')
expected = (
'class_loader_context_arg='
'--class-loader-context=PCL[]{'
'PCL[out/adir/a.jar]#'
'PCL[out/bdir/b.jar]{'
'PCL[out/b1dir/b1.jar]#'
'PCL[out/b2dir/b2.jar]#'
'PCL[out/b4dir/b4.jar]{'
'PCL[out/b41dir/b41.jar]#'
'PCL[out/b42dir/b42.jar]'
'}'
'}'
'}'
' ; '
'stored_class_loader_context_arg='
'--stored-class-loader-context=PCL[]{'
'PCL[/system/a.jar]#'
'PCL[/product/b.jar]{'
'PCL[/product/b1.jar]#'
'PCL[/product/b2.jar]#'
'PCL[/product/b4.jar]{'
'PCL[/product/b41.jar]#'
'PCL[/product/b42.jar]'
'}'
'}'
'}')
self.assertEqual(actual, expected)
def test_construct_context_S(self):
actual = construct_context_args('S')
expected = (
'class_loader_context_arg='
'--class-loader-context=PCL[]{'
'PCL[out/adir/a.jar]#'
'PCL[out/bdir/b.jar]{'
'PCL[out/b1dir/b1.jar]#'
'PCL[out/b2dir/b2.jar]#'
'PCL[out/b4dir/b4.jar]{'
'PCL[out/b41dir/b41.jar]#'
'PCL[out/b42dir/b42.jar]'
'}'
'}'
'}'
' ; '
'stored_class_loader_context_arg='
'--stored-class-loader-context=PCL[]{'
'PCL[/system/a.jar]#'
'PCL[/product/b.jar]{'
'PCL[/product/b1.jar]#'
'PCL[/product/b2.jar]#'
'PCL[/product/b4.jar]{'
'PCL[/product/b41.jar]#'
'PCL[/product/b42.jar]'
'}'
'}'
'}')
self.assertEqual(actual, expected)
if __name__ == '__main__':
unittest.main(verbosity=2)
Reference in a new issue View git blame Copy permalink