From 454a6940e79c925e3697e150afe15fe857c420b8 Mon Sep 17 00:00:00 2001 From: Dmitrii Ishcheikin Date: Tue, 13 Jun 2023 13:46:37 +0000 Subject: Reland "Static link gtests with ART libraries" This reverts commit b89b62d8ca79c1a8d349c6c30f43bfa8b9a43ed3. Reason for revert: fix asan gtests Link `libsigchain` statically in gtests, because dynamic `libsigchain.so` interferes with ASAN init and breaks the tests. Bug: 261703065 Bug: 247108425 Test: TARGET_PRODUCT=armv8 TARGET_BUILD_VARIANT=eng ./prebuilts/build-tools/path/linux-x86/python3 ./art/test/testrunner/run_build_test_target.py -j80 art-gtest-asan32 Test: ABTD v2/android-virtual-infra/arm_cf/test-mapping-hwasan-presubmit Test: ABTD art-gtest-asan32 art-gtest-asan64 Test: m test-art-host-gtest Test: m mts && mts-tradefed run commandAndExit mts-art Change-Id: Ibbcc418aa33c5f4923100f3f83c8e21c189f8ad0 --- build/apex/art_apex_test.py | 5 ----- 1 file changed, 5 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 891fd0f0a5..0c813d11de 100755 --- a/build/apex/art_apex_test.py +++ b/build/apex/art_apex_test.py @@ -697,11 +697,6 @@ class TestingTargetChecker: self._checker.check_art_test_executable('art_runtime_tests') self._checker.check_art_test_executable('art_sigchain_tests') - # Check ART test (internal) libraries. - self._checker.check_native_library('libartd-gtest') - self._checker.check_native_library('libartd-simulator-container') - self._checker.check_native_library('libartbased-testing') - # Check ART test tools. self._checker.check_executable('signal_dumper') -- cgit v1.2.3-59-g8ed1b