From 01e6b56f6a5290a01c00ce1f0d3579a41a27b2e5 Mon Sep 17 00:00:00 2001 From: Ulya Trafimovich Date: Tue, 17 Jan 2023 13:13:55 +0000 Subject: riscv64: disable gtests for unsupported components. Bug: b/271573990 Test: gtests on host: lunch aosp_riscv64-userdebug && m test-art-host-gtest Test: gtests on target (on a Linux RISC-V VM): lunch aosp_riscv64-userdebug export ART_TEST_SSH_USER=ubuntu export ART_TEST_SSH_HOST=localhost export ART_TEST_SSH_PORT=10001 export ART_TEST_ON_VM=true . art/tools/buildbot-utils.sh art/tools/buildbot-build.sh --target # Create, boot and configure the VM. art/tools/buildbot-vm.sh create art/tools/buildbot-vm.sh boot art/tools/buildbot-vm.sh setup-ssh # password: 'ubuntu' art/tools/buildbot-cleanup-device.sh art/tools/buildbot-setup-device.sh art/tools/buildbot-sync.sh art/tools/run-gtests.sh Change-Id: I278e3453406a91a5e9d03645cafb9a9d1f82d896 --- libartbase/base/file_utils.cc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libartbase/base/file_utils.cc') diff --git a/libartbase/base/file_utils.cc b/libartbase/base/file_utils.cc index 8228cd6ba2..899cea7a11 100644 --- a/libartbase/base/file_utils.cc +++ b/libartbase/base/file_utils.cc @@ -360,6 +360,9 @@ static bool MaybeAppendBootImageMainlineExtension(const std::string& android_roo // `-.art`. std::string library_name = GetFirstMainlineFrameworkLibraryName(error_msg); if (library_name.empty()) { + if (kRuntimeISA == InstructionSet::kRiscv64) { + return true; + } return false; } -- cgit v1.2.3-59-g8ed1b