diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-18 09:16:56 -0800 |
|---|---|---|
| committer | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-18 09:25:19 -0800 |
| commit | a2c45bea234e6d1c45bae4dd9c4632051eb1fb67 (patch) | |
| tree | e796a37895a74a9ecffab0478f63011c8711b73c /zucchini_commands.cc | |
| parent | a90c04389f86ed4363674e20b0d5f171dea7ebeb (diff) | |
| parent | 9a6bb5673d3441e0aee2c3e79e6dec027840d7e1 (diff) | |
| download | zucchini-a2c45bea234e6d1c45bae4dd9c4632051eb1fb67.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-main'
CL
* 261f4df0 Update callsites to use WIN_-prefixed base::File flags.
cause build failure on android, because AOSP's copy of libchrome doesn't
have WIN_ prefix. To address that I added
Change-Id: I5457ae8b784b86644f0ae86182bcb0422629bfd3
Diffstat (limited to 'zucchini_commands.cc')
| -rw-r--r-- | zucchini_commands.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/zucchini_commands.cc b/zucchini_commands.cc index 0699cbe..225fc25 100644 --- a/zucchini_commands.cc +++ b/zucchini_commands.cc @@ -60,7 +60,7 @@ zucchini::status::Code MainRead(MainParams params) { CHECK_EQ(1U, params.file_paths.size()); base::File input_file(params.file_paths[0], base::File::FLAG_OPEN | base::File::FLAG_READ | - base::File::FLAG_SHARE_DELETE); + base::File::FLAG_WIN_SHARE_DELETE); zucchini::MappedFileReader input(std::move(input_file)); if (input.HasError()) { LOG(ERROR) << "Error with file " << params.file_paths[0].value() << ": " @@ -80,7 +80,7 @@ zucchini::status::Code MainDetect(MainParams params) { CHECK_EQ(1U, params.file_paths.size()); base::File input_file(params.file_paths[0], base::File::FLAG_OPEN | base::File::FLAG_READ | - base::File::FLAG_SHARE_DELETE); + base::File::FLAG_WIN_SHARE_DELETE); zucchini::MappedFileReader input(std::move(input_file)); if (input.HasError()) { LOG(ERROR) << "Error with file " << params.file_paths[0].value() << ": " @@ -100,7 +100,7 @@ zucchini::status::Code MainMatch(MainParams params) { CHECK_EQ(2U, params.file_paths.size()); using base::File; File old_file(params.file_paths[0], File::FLAG_OPEN | File::FLAG_READ | - base::File::FLAG_SHARE_DELETE); + base::File::FLAG_WIN_SHARE_DELETE); zucchini::MappedFileReader old_image(std::move(old_file)); if (old_image.HasError()) { LOG(ERROR) << "Error with file " << params.file_paths[0].value() << ": " @@ -108,7 +108,7 @@ zucchini::status::Code MainMatch(MainParams params) { return zucchini::status::kStatusFileReadError; } File new_file(params.file_paths[1], File::FLAG_OPEN | File::FLAG_READ | - base::File::FLAG_SHARE_DELETE); + base::File::FLAG_WIN_SHARE_DELETE); zucchini::MappedFileReader new_image(std::move(new_file)); if (new_image.HasError()) { LOG(ERROR) << "Error with file " << params.file_paths[1].value() << ": " @@ -131,7 +131,7 @@ zucchini::status::Code MainCrc32(MainParams params) { CHECK_EQ(1U, params.file_paths.size()); base::File image_file(params.file_paths[0], base::File::FLAG_OPEN | base::File::FLAG_READ | - base::File::FLAG_SHARE_DELETE); + base::File::FLAG_WIN_SHARE_DELETE); zucchini::MappedFileReader image(std::move(image_file)); if (image.HasError()) { LOG(ERROR) << "Error with file " << params.file_paths[0].value() << ": " |