diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-02 21:56:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-02 21:56:43 +0000 |
| commit | 8be98142ecdba40b2ea9be10b11a23f4e6b67b05 (patch) | |
| tree | 0a310ca653ef73c547d80da63c87fcb2c0636bcb /main_utils.cc | |
| parent | b77318bc7ecfba25e4966b56b9e9ab593925ad9d (diff) | |
| parent | 7be427590935bc88198d32004449ccfcf60b60d4 (diff) | |
| download | zucchini-8be98142ecdba40b2ea9be10b11a23f4e6b67b05.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-main' into dev am: a90c04389f am: ddc43dc959 am: d9eed84a58 am: 58b4d19a6b am: 7be4275909
Original change: https://android-review.googlesource.com/c/platform/external/zucchini/+/1877854
Change-Id: Ifdb1f7882cc237258a3395d28158d50bb4b43136
Diffstat (limited to 'main_utils.cc')
| -rw-r--r-- | main_utils.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/main_utils.cc b/main_utils.cc index 8c47c91..b499817 100644 --- a/main_utils.cc +++ b/main_utils.cc @@ -22,6 +22,7 @@ #include "base/time/time.h" #include "build/build_config.h" #include "components/zucchini/io_utils.h" +#include "components/zucchini/patch_utils.h" #include "components/zucchini/zucchini_commands.h" #if defined(OS_WIN) @@ -69,6 +70,7 @@ constexpr Command kCommands[] = { 3, &MainGen}, {"apply", "-apply <old_file> <patch_file> <new_file> [-keep]", 3, &MainApply}, + {"verify", "-verify <patch_file>", 1, &MainVerify}, {"read", "-read <exe> [-dump]", 1, &MainRead}, {"detect", "-detect <archive_file>", 1, &MainDetect}, {"match", "-match <old_file> <new_file> [-impose=#+#=#+#,#+#=#+#,...]", 2, @@ -206,6 +208,8 @@ bool CheckAndGetFilePathParams(const base::CommandLine& command_line, // Prints main Zucchini usage text. void PrintUsage(std::ostream& err) { + err << "Version: " << zucchini::kMajorVersion << "." + << zucchini::kMinorVersion << std::endl; err << "Usage:" << std::endl; for (const Command& command : kCommands) err << " zucchini " << command.usage << std::endl; |