commit 4526e2a5a9af44cb94e5a0b68d155c30ccebacfc
author Jiakai Zhang <jiakaiz@google.com> Mon Sep 18 17:45:26 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 18 17:45:26 2023 +0000
tree 6afb6042a74fec0b2216060d286426918dc0d9a9
parent 4499839c2677eb5a04418abd4d8acabd039c7978
parent 5b5be651a405a02eaba457033e38b1965f1ae62f

Merge "Don't clear profile on otapreopt." into main

cmds/installd/otapreopt.cpp

diff --git a/cmds/installd/otapreopt.cpp b/cmds/installd/otapreopt.cpp
index a447cda..822ab7f 100644
--- a/cmds/installd/otapreopt.cpp
+++ b/cmds/installd/otapreopt.cpp
@@ -437,6 +437,9 @@
                     maybe_open_reference_profile(parameters_.pkgName, parameters_.apk_path,
                                                  parameters_.profile_name, profile_guided,
                                                  is_public, parameters_.uid, is_secondary_dex);
+            // `maybe_open_reference_profile` installs a hook that clears the profile on
+            // destruction. Disable it.
+            reference_profile.DisableCleanup();
             struct stat sbuf;
             if (reference_profile.fd() == -1 ||
                 (fstat(reference_profile.fd(), &sbuf) != -1 && sbuf.st_size == 0)) {