Merge "The easter egg is now its own APK." into nyc-dev
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 856d3c2..5dffcac 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -113,7 +113,7 @@
# Must be of the form "YYYY-MM-DD" on production devices.
#
# If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
- PLATFORM_SECURITY_PATCH := 2016-07-05
+ PLATFORM_SECURITY_PATCH := 2016-08-05
endif
ifeq "" "$(PLATFORM_BASE_OS)"
diff --git a/tools/releasetools/blockimgdiff.py b/tools/releasetools/blockimgdiff.py
index a7a4098..66d5907 100644
--- a/tools/releasetools/blockimgdiff.py
+++ b/tools/releasetools/blockimgdiff.py
@@ -342,6 +342,21 @@
return ctx.hexdigest()
def WriteTransfers(self, prefix):
+ def WriteTransfersZero(out, to_zero):
+ """Limit the number of blocks in command zero to 1024 blocks.
+
+ This prevents the target size of one command from being too large; and
+ might help to avoid fsync errors on some devices."""
+
+ zero_blocks_limit = 1024
+ total = 0
+ while to_zero:
+ zero_blocks = to_zero.first(zero_blocks_limit)
+ out.append("zero %s\n" % (zero_blocks.to_string_raw(),))
+ total += zero_blocks.size()
+ to_zero = to_zero.subtract(zero_blocks)
+ return total
+
out = []
total = 0
@@ -523,9 +538,8 @@
elif xf.style == "zero":
assert xf.tgt_ranges
to_zero = xf.tgt_ranges.subtract(xf.src_ranges)
- if to_zero:
- out.append("%s %s\n" % (xf.style, to_zero.to_string_raw()))
- total += to_zero.size()
+ assert WriteTransfersZero(out, to_zero) == to_zero.size()
+ total += to_zero.size()
else:
raise ValueError("unknown transfer style '%s'\n" % xf.style)
@@ -554,7 +568,8 @@
# Zero out extended blocks as a workaround for bug 20881595.
if self.tgt.extended:
- out.append("zero %s\n" % (self.tgt.extended.to_string_raw(),))
+ assert (WriteTransfersZero(out, self.tgt.extended) ==
+ self.tgt.extended.size())
total += self.tgt.extended.size()
# We erase all the blocks on the partition that a) don't contain useful