diff options
| author | 2023-09-18 20:37:06 +0000 | |
|---|---|---|
| committer | 2023-09-18 20:37:06 +0000 | |
| commit | bc3081d0eff8a9a2c7cfbfbb222e7b0846eeb957 (patch) | |
| tree | ee7d41c731a42b253277869f2a62b2a73c9591bf | |
| parent | 7956a5cf442da19c106f716c78f1e5c3f3d5127b (diff) | |
| parent | 00c7781bb608c0ddec47ba144c980f0826bd96b6 (diff) | |
Merge "Don't clear profile on otapreopt." into main am: 4526e2a5a9 am: 325bf88689 am: 00c7781bb6
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2754665
Change-Id: I84d30d0ef3cc332df6e97404868ab1561ee6a5de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cmds/installd/otapreopt.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmds/installd/otapreopt.cpp b/cmds/installd/otapreopt.cpp index a447cda492..822ab7fbb7 100644 --- a/cmds/installd/otapreopt.cpp +++ b/cmds/installd/otapreopt.cpp @@ -437,6 +437,9 @@ private: 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)) { |