diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-19 19:59:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-19 19:59:02 +0000 |
| commit | dd0b6e3bf2772b7aa743d157d3070bd6cd204a6e (patch) | |
| tree | e796a37895a74a9ecffab0478f63011c8711b73c /zucchini_integration.cc | |
| parent | 58b4d19a6b6c8a6790c31bb3d6fcd13a8892239b (diff) | |
| parent | 0d1306182f498b99796919b13f6ba7ff0961d64d (diff) | |
| download | zucchini-dd0b6e3bf2772b7aa743d157d3070bd6cd204a6e.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-main' am: a2c45bea23 am: 0d1306182f
Original change: https://android-review.googlesource.com/c/platform/external/zucchini/+/1895428
Change-Id: I210ab6c049b54c4bbe9863c5bed9db964ee8b4d1
Diffstat (limited to 'zucchini_integration.cc')
| -rw-r--r-- | zucchini_integration.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/zucchini_integration.cc b/zucchini_integration.cc index bf28b3c..c654a08 100644 --- a/zucchini_integration.cc +++ b/zucchini_integration.cc @@ -184,11 +184,12 @@ status::Code Generate(const base::FilePath& old_path, std::string imposed_matches) { using base::File; File old_file(old_path, File::FLAG_OPEN | File::FLAG_READ | - base::File::FLAG_SHARE_DELETE); + base::File::FLAG_WIN_SHARE_DELETE); File new_file(new_path, File::FLAG_OPEN | File::FLAG_READ | - base::File::FLAG_SHARE_DELETE); + base::File::FLAG_WIN_SHARE_DELETE); File patch_file(patch_path, File::FLAG_CREATE_ALWAYS | File::FLAG_READ | - File::FLAG_WRITE | File::FLAG_SHARE_DELETE | + File::FLAG_WRITE | + File::FLAG_WIN_SHARE_DELETE | File::FLAG_CAN_DELETE_ON_CLOSE); const FileNames file_names(old_path, new_path, patch_path); return GenerateCommon(std::move(old_file), std::move(new_file), @@ -211,11 +212,11 @@ status::Code Apply(const base::FilePath& old_path, bool force_keep) { using base::File; File old_file(old_path, File::FLAG_OPEN | File::FLAG_READ | - base::File::FLAG_SHARE_DELETE); + base::File::FLAG_WIN_SHARE_DELETE); File patch_file(patch_path, File::FLAG_OPEN | File::FLAG_READ | - base::File::FLAG_SHARE_DELETE); + base::File::FLAG_WIN_SHARE_DELETE); File new_file(new_path, File::FLAG_CREATE_ALWAYS | File::FLAG_READ | - File::FLAG_WRITE | File::FLAG_SHARE_DELETE | + File::FLAG_WRITE | File::FLAG_WIN_SHARE_DELETE | File::FLAG_CAN_DELETE_ON_CLOSE); const FileNames file_names(old_path, new_path, patch_path); return ApplyCommon(std::move(old_file), std::move(patch_file), |