diff options
| author | Tianjie Xu <xunchang@google.com> | 2019-05-24 20:46:51 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-24 20:46:51 +0200 |
| commit | e255db34b15d2020b5b3206723b7fa4ca2a6cdc0 (patch) | |
| tree | 558494b99abc4209ef226aa5e6d9ca8841f1d897 /updater/blockimg.cpp | |
| parent | [automerger skipped] Add misc_writer. am: 35e0f6d290 -s ours am: 865c17893b -s ours (diff) | |
| parent | Merge "Some clean ups to the updater" am: 52e61f6995 am: a0c0e04163 (diff) | |
| download | android_bootable_recovery-e255db34b15d2020b5b3206723b7fa4ca2a6cdc0.tar android_bootable_recovery-e255db34b15d2020b5b3206723b7fa4ca2a6cdc0.tar.gz android_bootable_recovery-e255db34b15d2020b5b3206723b7fa4ca2a6cdc0.tar.bz2 android_bootable_recovery-e255db34b15d2020b5b3206723b7fa4ca2a6cdc0.tar.lz android_bootable_recovery-e255db34b15d2020b5b3206723b7fa4ca2a6cdc0.tar.xz android_bootable_recovery-e255db34b15d2020b5b3206723b7fa4ca2a6cdc0.tar.zst android_bootable_recovery-e255db34b15d2020b5b3206723b7fa4ca2a6cdc0.zip | |
Diffstat (limited to '')
| -rw-r--r-- | updater/blockimg.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp index 55218b023..2d41f610b 100644 --- a/updater/blockimg.cpp +++ b/updater/blockimg.cpp @@ -49,7 +49,6 @@ #include <brotli/decode.h> #include <fec/io.h> #include <openssl/sha.h> -#include <private/android_filesystem_config.h> #include <verity/hash_tree_builder.h> #include <ziparchive/zip_archive.h> @@ -63,10 +62,15 @@ #include "private/commands.h" #include "updater/install.h" -// Set this to 0 to interpret 'erase' transfers to mean do a -// BLKDISCARD ioctl (the normal behavior). Set to 1 to interpret -// erase to mean fill the region with zeroes. +#ifdef __ANDROID__ +#include <private/android_filesystem_config.h> +// Set this to 0 to interpret 'erase' transfers to mean do a BLKDISCARD ioctl (the normal behavior). +// Set to 1 to interpret erase to mean fill the region with zeroes. #define DEBUG_ERASE 0 +#else +#define DEBUG_ERASE 1 +#define AID_SYSTEM -1 +#endif // __ANDROID__ static constexpr size_t BLOCKSIZE = 4096; static constexpr mode_t STASH_DIRECTORY_MODE = 0700; |