From 5045a8060a75ccccea94eac7363744ed63580ff9 Mon Sep 17 00:00:00 2001 From: Jiakai Zhang Date: Wed, 12 Mar 2025 16:45:38 +0000 Subject: Allow APEX versions in the OAT header to be overriden. APEX versions are stringified mtime's of the APEXes installed on device, for detecting samegrade placebos (go/samegrade-placebos). In the case of Cloud Compilation, we cannot put the APEX versions in the OAT header because the OAT file is generated on the server. Instead, we put the APEX versions in a separate file (SDC file) when the SDM file is being installed on device. Therefore, we need a way to override the APEX versions in the OAT header. This is a no-op change. Bug: 377474232 Test: m test-art-host-gtest-art_runtime_tests Change-Id: I69658b61942979ff7f56e4908ce3204bd0a2116e --- runtime/oat/oat_file_assistant.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'runtime/oat/oat_file_assistant.cc') diff --git a/runtime/oat/oat_file_assistant.cc b/runtime/oat/oat_file_assistant.cc index f5d6832cff..8df8459589 100644 --- a/runtime/oat/oat_file_assistant.cc +++ b/runtime/oat/oat_file_assistant.cc @@ -491,10 +491,7 @@ OatFileAssistant::OatStatus OatFileAssistant::GivenOatFileStatus(const OatFile& return kOatBootImageOutOfDate; } if (!gc::space::ImageSpace::ValidateApexVersions( - file.GetOatHeader(), - GetOatFileAssistantContext()->GetApexVersions(), - file.GetLocation(), - error_msg)) { + file, GetOatFileAssistantContext()->GetApexVersions(), error_msg)) { return kOatBootImageOutOfDate; } } -- cgit v1.2.3-59-g8ed1b