From 2b7be1efa1ba363778057d4e42fccab8afe3046b Mon Sep 17 00:00:00 2001 From: Dmitrii Ishcheikin Date: Wed, 12 Oct 2022 14:15:31 +0000 Subject: Merge libart and libart-compiler into a single library Rename old libart into libart-runtime Build libart-runtime and libart-compiler separately as static libraries This is required to support PGO (compiler) and AFDO (runtime) without mixing them Combine libart-runtime and libart-compiler into libart with whole-archive linking This change negates all size savings from libart-compiler version script, it will be restored in a follow-up CL Bug: 186902856 Test: m test-art-host-gtest Test: m libart libartd dex2oat dex2oatd oatdump oatdumps Test: art/build/apex/runtests.sh Test: art/tools/run-gtests.sh Test: art/test/testrunner/testrunner.py --target --64 Test: art/tools/run-libcore-tests.sh --mode=device --variant=X64 Test: art/tools/run-libjdwp-tests.sh --mode=device --variant=X64 Change-Id: I6b9717cf49007e77691d49a2dca18a8064749154 --- build/apex/art_apex_test.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'build/apex/art_apex_test.py') diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py index 900ada7926..8f145b9357 100755 --- a/build/apex/art_apex_test.py +++ b/build/apex/art_apex_test.py @@ -475,7 +475,6 @@ class ReleaseChecker: # Check internal libraries for ART. self._checker.check_native_library('libadbconnection') self._checker.check_native_library('libart') - self._checker.check_native_library('libart-compiler') self._checker.check_native_library('libart-dexlayout') self._checker.check_native_library('libart-disassembler') self._checker.check_native_library('libartbase') @@ -620,7 +619,6 @@ class DebugChecker: self._checker.check_native_library('libadbconnectiond') self._checker.check_native_library('libartbased') self._checker.check_native_library('libartd') - self._checker.check_native_library('libartd-compiler') self._checker.check_native_library('libartd-dexlayout') self._checker.check_native_library('libartd-disassembler') self._checker.check_native_library('libopenjdkjvmd') -- cgit v1.2.3-59-g8ed1b