commit ca32797f26d82feb93bb760a886805e9f173c791
author Jiakai Zhang <jiakaiz@google.com> Tue Oct 18 10:59:10 2022 +0100
committer Jiakai Zhang <jiakaiz@google.com> Thu Oct 20 14:32:59 2022 +0000
tree 97aca6f55f10517b451fd5b527211c12c6035bc0
parent 2617a9d2ec3c5c7506733a703ab36bd08e6a6dc5

Update artd to support profiles for secondary dex files.

Bug: 249984283
Test: atest ArtServiceTests
Test: m test-art-host-gtest-art_artd_tests
Ignore-AOSP-First: ART Services.
Change-Id: I35e19e7fa2147717754feddbc72a46983dc0d9d8

artd/path_utils.h

diff --git a/artd/path_utils.h b/artd/path_utils.h
index 5b2b1d3..bfbbd80 100644
--- a/artd/path_utils.h
+++ b/artd/path_utils.h
@@ -42,17 +42,30 @@
   return ReplaceFileExtension(oat_path, "art");
 }
 
-android::base::Result<std::string> BuildRefProfilePath(
-    const aidl::com::android::server::art::ProfilePath::RefProfilePath& ref_profile_path);
-
-android::base::Result<std::string> BuildTmpRefProfilePath(
-    const aidl::com::android::server::art::ProfilePath::TmpRefProfilePath& tmp_ref_profile_path);
+android::base::Result<std::string> BuildPrimaryRefProfilePath(
+    const aidl::com::android::server::art::ProfilePath::PrimaryRefProfilePath&
+        primary_ref_profile_path);
 
 android::base::Result<std::string> BuildPrebuiltProfilePath(
     const aidl::com::android::server::art::ProfilePath::PrebuiltProfilePath& prebuilt_profile_path);
 
-android::base::Result<std::string> BuildCurProfilePath(
-    const aidl::com::android::server::art::ProfilePath::CurProfilePath& cur_profile_path);
+android::base::Result<std::string> BuildPrimaryCurProfilePath(
+    const aidl::com::android::server::art::ProfilePath::PrimaryCurProfilePath&
+        primary_cur_profile_path);
+
+android::base::Result<std::string> BuildSecondaryRefProfilePath(
+    const aidl::com::android::server::art::ProfilePath::SecondaryRefProfilePath&
+        secondary_ref_profile_path);
+
+android::base::Result<std::string> BuildSecondaryCurProfilePath(
+    const aidl::com::android::server::art::ProfilePath::SecondaryCurProfilePath&
+        secondary_cur_profile_path);
+
+android::base::Result<std::string> BuildFinalProfilePath(
+    const aidl::com::android::server::art::ProfilePath::TmpProfilePath& tmp_profile_path);
+
+android::base::Result<std::string> BuildTmpProfilePath(
+    const aidl::com::android::server::art::ProfilePath::TmpProfilePath& tmp_profile_path);
 
 android::base::Result<std::string> BuildDexMetadataPath(
     const aidl::com::android::server::art::DexMetadataPath& dex_metadata_path);