commit 05e0e38c30824b727f3582c90258d9bb19cc3f47
author Alex Deymo <deymo@google.com> Mon Dec 07 20:18:16 2015 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Dec 12 05:23:26 2015 +0000
tree 686a3a3060403debef5e7591343ca53d136ceec1
parent 5a4c5130390f7433aa725996ad95043a0554707c

Compile delta_generator for the host.

Bug: 24619596
TEST=mma on linux.

Change-Id: Icccae2b938b4fdd698b177beee96ffb62e9f63ae

payload_consumer/delta_performer.cc

diff --git a/payload_consumer/delta_performer.cc b/payload_consumer/delta_performer.cc
index 6261cb1..e56bb75 100644
--- a/payload_consumer/delta_performer.cc
+++ b/payload_consumer/delta_performer.cc
@@ -882,10 +882,15 @@
   TEST_AND_RETURN_FALSE(!operation.has_data_offset());
   TEST_AND_RETURN_FALSE(!operation.has_data_length());
 
+#ifdef BLKZEROOUT
+  bool attempt_ioctl = true;
   int request =
       (operation.type() == InstallOperation::ZERO ? BLKZEROOUT : BLKDISCARD);
+#else  // !defined(BLKZEROOUT)
+  bool attempt_ioctl = false;
+  int request = 0;
+#endif  // !defined(BLKZEROOUT)
 
-  bool attempt_ioctl = true;
   brillo::Blob zeros;
   for (int i = 0; i < operation.dst_extents_size(); i++) {
     Extent extent = operation.dst_extents(i);

payload_consumer/file_descriptor.cc

diff --git a/payload_consumer/file_descriptor.cc b/payload_consumer/file_descriptor.cc
index f26be28..309c60d 100644
--- a/payload_consumer/file_descriptor.cc
+++ b/payload_consumer/file_descriptor.cc
@@ -69,6 +69,11 @@
                                        uint64_t start,
                                        uint64_t length,
                                        int* result) {
+  // If the ioctl BLKZEROOUT is not defined, just fail to perform any of these
+  // operations.
+#ifndef BLKZEROOUT
+  return false;
+#else  // defined(BLKZEROOUT)
   DCHECK(request == BLKDISCARD || request == BLKZEROOUT ||
          request == BLKSECDISCARD);
   // On some devices, the BLKDISCARD will actually read back as zeros, instead
@@ -99,6 +104,7 @@
     return false;
   }
   return true;
+#endif  // defined(BLKZEROOUT)
 }
 
 bool EintrSafeFileDescriptor::Close() {