From a9522673f3076ea937eb2912945d7ed646ca05df Mon Sep 17 00:00:00 2001
From: Lajos Molnar <lajos@google.com>
Date: Wed, 6 Aug 2014 11:30:16 -0700
Subject: [PATCH] stagefright: move ARRAY_SIZE to foundation

Bug: 11990470
Change-Id: Ifae790b774a0fb210acbe33a1310d3d6ba46e7fa
---
 include/media/stagefright/foundation/ABase.h                | 2 ++
 media/libstagefright/include/SoftVideoDecoderOMXComponent.h | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/media/stagefright/foundation/ABase.h b/include/media/stagefright/foundation/ABase.h
index 949d49e70f..72e3d87cd3 100644
--- a/include/media/stagefright/foundation/ABase.h
+++ b/include/media/stagefright/foundation/ABase.h
@@ -18,6 +18,8 @@
 
 #define A_BASE_H_
 
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a)))
+
 #define DISALLOW_EVIL_CONSTRUCTORS(name) \
     name(const name &); \
     name &operator=(const name &)
diff --git a/media/libstagefright/include/SoftVideoDecoderOMXComponent.h b/media/libstagefright/include/SoftVideoDecoderOMXComponent.h
index d050fa6a73..7f200dd94c 100644
--- a/media/libstagefright/include/SoftVideoDecoderOMXComponent.h
+++ b/media/libstagefright/include/SoftVideoDecoderOMXComponent.h
@@ -27,8 +27,6 @@
 #include <utils/threads.h>
 #include <utils/Vector.h>
 
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a)))
-
 namespace android {
 
 struct SoftVideoDecoderOMXComponent : public SimpleSoftOMXComponent {
-- 
2.11.0