commit b1d3db624040a10e88415480531d7623cc31fdf7
author Jiakai Zhang <jiakaiz@google.com> Fri Nov 11 14:00:44 2022 +0000
committer Jiakai Zhang <jiakaiz@google.com> Wed Nov 23 10:38:15 2022 +0000
tree f1ed6ac5b40f3407e23149dbab6468ab30790c52
parent 162104cb2fd75f14d9d6a81e83e7678b77ae4874

Support snapshotting profiles.

Bug: 258486155
Test: atest ArtServiceTests
Test: adb shell pm art snapshot-app-profile /data/system/1.prof com.google.android.youtube
Test: adb shell pm art snapshot-boot-image-profile /data/system/1.prof
Ignore-AOSP-First: ART Services.
Change-Id: I81220ca563ac24100056083bc4a4a8661c0dc1d0

libartservice/service/java/com/android/server/art/DexOptimizer.java

diff --git a/libartservice/service/java/com/android/server/art/DexOptimizer.java b/libartservice/service/java/com/android/server/art/DexOptimizer.java
index 51443c6..13afa0b 100644
--- a/libartservice/service/java/com/android/server/art/DexOptimizer.java
+++ b/libartservice/service/java/com/android/server/art/DexOptimizer.java
@@ -490,8 +490,8 @@
         OutputProfile output = buildOutputProfile(dexInfo, false /* isPublic */);
 
         try {
-            if (mInjector.getArtd().mergeProfiles(
-                        getCurProfiles(dexInfo), referenceProfile, output, dexInfo.dexPath())) {
+            if (mInjector.getArtd().mergeProfiles(getCurProfiles(dexInfo), referenceProfile, output,
+                        List.of(dexInfo.dexPath()), new MergeProfileOptions())) {
                 return ProfilePath.tmpProfilePath(output.profilePath);
             }
         } catch (ServiceSpecificException e) {