commit 789b3d286aa313e7e1cf827b914323c57a7032e8
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 20 07:24:33 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 20 07:24:33 2019 +0000
tree 71d90ffd7d8013e21e9eebeabe24ef7de3d5a678
parent 7cffb3e472cc78b0bfe8fcb74bec183037e92e9b
parent 70ba790326ef1b8ed6bb0e37702efcb85be4d914

Merge "Remove ld.config.recovery.txt build" am: 5bc7941be3 am: da084f96a5

Change-Id: I4c22ba4d7f054e33d39cef15a9b9a071700ba621

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) {