commit 470246e20572b7d2312f07204f53229877249177
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Dec 16 18:55:34 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Dec 16 18:55:34 2019 +0000
tree ea36a959204782747e72d20e91b059e3d6c31b0d
parent 7b46db7c4f8b82af4eefa6bfcd75cf9cdd46edd7
parent b30940aa54c2caf09a63eee9e9fc82499a04b06a

Merge "Rename unzip.cpp to ziptool.cpp." am: cd652ea3dc am: 8025cee478

Change-Id: I785ee3029bf7c34a63cd48b56ebf977773543e26

libutils/include/utils/Flattenable.h

diff --git a/libutils/include/utils/Flattenable.h b/libutils/include/utils/Flattenable.h
index 953b859..17c5e10 100644
--- a/libutils/include/utils/Flattenable.h
+++ b/libutils/include/utils/Flattenable.h
@@ -52,7 +52,12 @@
 
     template<size_t N>
     static size_t align(void*& buffer) {
-        return align<N>( const_cast<void const*&>(buffer) );
+        static_assert(!(N & (N - 1)), "Can only align to a power of 2.");
+        void* b = buffer;
+        buffer = reinterpret_cast<void*>((uintptr_t(buffer) + (N-1)) & ~(N-1));
+        size_t delta = size_t(uintptr_t(buffer) - uintptr_t(b));
+        memset(b, 0, delta);
+        return delta;
     }
 
     static void advance(void*& buffer, size_t& size, size_t offset) {