diff options
author | Tao Bao <tbao@google.com> | 2018-07-09 19:49:07 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-07-09 19:49:07 +0200 |
commit | b450952d6aec60cea05fc2a6728b37a8ba13c57e (patch) | |
tree | d17cd00549fddc484bdb926f66287ee76cc692cf /updater/blockimg.cpp | |
parent | Merge "tests: Split unit tests out of component/applypatch_test.cpp." (diff) | |
parent | Merge "updater: Add ABORT command." (diff) | |
download | android_bootable_recovery-b450952d6aec60cea05fc2a6728b37a8ba13c57e.tar android_bootable_recovery-b450952d6aec60cea05fc2a6728b37a8ba13c57e.tar.gz android_bootable_recovery-b450952d6aec60cea05fc2a6728b37a8ba13c57e.tar.bz2 android_bootable_recovery-b450952d6aec60cea05fc2a6728b37a8ba13c57e.tar.lz android_bootable_recovery-b450952d6aec60cea05fc2a6728b37a8ba13c57e.tar.xz android_bootable_recovery-b450952d6aec60cea05fc2a6728b37a8ba13c57e.tar.zst android_bootable_recovery-b450952d6aec60cea05fc2a6728b37a8ba13c57e.zip |
Diffstat (limited to 'updater/blockimg.cpp')
-rw-r--r-- | updater/blockimg.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp index 937c5e14b..fc713859b 100644 --- a/updater/blockimg.cpp +++ b/updater/blockimg.cpp @@ -1489,6 +1489,11 @@ static int PerformCommandErase(CommandParameters& params) { return 0; } +static int PerformCommandAbort(CommandParameters&) { + LOG(INFO) << "Aborting as instructed"; + return -1; +} + using CommandFunction = std::function<int(CommandParameters&)>; using CommandMap = std::unordered_map<Command::Type, CommandFunction>; @@ -1888,6 +1893,7 @@ Value* BlockImageVerifyFn(const char* name, State* state, // Commands which are not allowed are set to nullptr to skip them completely. const CommandMap command_map{ // clang-format off + { Command::Type::ABORT, PerformCommandAbort }, { Command::Type::BSDIFF, PerformCommandDiff }, { Command::Type::ERASE, nullptr }, { Command::Type::FREE, PerformCommandFree }, @@ -1908,6 +1914,7 @@ Value* BlockImageUpdateFn(const char* name, State* state, const std::vector<std::unique_ptr<Expr>>& argv) { const CommandMap command_map{ // clang-format off + { Command::Type::ABORT, PerformCommandAbort }, { Command::Type::BSDIFF, PerformCommandDiff }, { Command::Type::ERASE, PerformCommandErase }, { Command::Type::FREE, PerformCommandFree }, |