gralloc: Refactor size calculation
Make GetSize return the final aligned, layer counted size.
This can be used at other locations
Change-Id: I5a8940b565eec6c8e709163c7736d485688ddb2e
diff --git a/gralloc/gr_allocator.h b/gralloc/gr_allocator.h
index 2f73a0d..46ec09d 100644
--- a/gralloc/gr_allocator.h
+++ b/gralloc/gr_allocator.h
@@ -30,16 +30,11 @@
#ifndef __GR_ALLOCATOR_H__
#define __GR_ALLOCATOR_H__
-#ifdef MASTER_SIDE_CP
-#define SECURE_ALIGN SZ_4K
-#else
-#define SECURE_ALIGN SZ_1M
-#endif
-
#include <vector>
#include "gr_buf_descriptor.h"
#include "gr_ion_alloc.h"
+#include "gr_utils.h"
#include "gralloc_priv.h"
namespace gralloc {