summaryrefslogtreecommitdiffstats
path: root/updater/blockimg.cpp
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2019-05-22 23:48:35 +0200
committerTianjie Xu <xunchang@google.com>2019-05-22 23:58:28 +0200
commit27556d089f8496c2acb72182ce7add94938eb749 (patch)
tree7fca14e5fe7b8178a996501df0515ddabcfd9ed2 /updater/blockimg.cpp
parentMerge "recovery: report compliant reboot reason" (diff)
downloadandroid_bootable_recovery-27556d089f8496c2acb72182ce7add94938eb749.tar
android_bootable_recovery-27556d089f8496c2acb72182ce7add94938eb749.tar.gz
android_bootable_recovery-27556d089f8496c2acb72182ce7add94938eb749.tar.bz2
android_bootable_recovery-27556d089f8496c2acb72182ce7add94938eb749.tar.lz
android_bootable_recovery-27556d089f8496c2acb72182ce7add94938eb749.tar.xz
android_bootable_recovery-27556d089f8496c2acb72182ce7add94938eb749.tar.zst
android_bootable_recovery-27556d089f8496c2acb72182ce7add94938eb749.zip
Diffstat (limited to '')
-rw-r--r--updater/blockimg.cpp12
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;