From b51e18d59b6f8e44a5d3516fc3359c54fa913331 Mon Sep 17 00:00:00 2001
From: Mathias Agopian <mathias@google.com>
Date: Tue, 5 May 2009 18:21:32 -0700
Subject: [PATCH] move android_native_buffer_t declaration into its own
 private/ui/android_native_priv.h header, since user code should never have
 access to it.

---
 include/private/ui/SurfaceBuffer.h        |  2 +-
 include/private/ui/android_natives_priv.h | 62 +++++++++++++++++++++++
 include/ui/egl/android_natives.h          | 26 ----------
 libs/ui/FramebufferNativeWindow.cpp       |  2 +
 opengl/libagl/TextureObjectManager.cpp    |  2 +-
 opengl/libagl/egl.cpp                     |  2 +-
 opengl/libagl/texture.cpp                 |  2 +-
 7 files changed, 68 insertions(+), 30 deletions(-)
 create mode 100644 include/private/ui/android_natives_priv.h

diff --git a/include/private/ui/SurfaceBuffer.h b/include/private/ui/SurfaceBuffer.h
index a6db50f4cf696..c45abeb73c250 100644
--- a/include/private/ui/SurfaceBuffer.h
+++ b/include/private/ui/SurfaceBuffer.h
@@ -22,7 +22,7 @@
 
 #include <utils/RefBase.h>
 
-#include <ui/egl/android_natives.h>
+#include <private/ui/android_natives_priv.h>
 
 namespace android {
 
diff --git a/include/private/ui/android_natives_priv.h b/include/private/ui/android_natives_priv.h
new file mode 100644
index 0000000000000..ee843e928100a
--- /dev/null
+++ b/include/private/ui/android_natives_priv.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ANDROID_ANDROID_NATIVES_PRIV_H
+#define ANDROID_ANDROID_NATIVES_PRIV_H
+
+#include <ui/egl/android_natives.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*****************************************************************************/
+
+struct android_native_buffer_t
+{
+#ifdef __cplusplus
+    android_native_buffer_t() { 
+        common.magic = ANDROID_NATIVE_BUFFER_MAGIC;
+        common.version = sizeof(android_native_buffer_t);
+        memset(common.reserved, 0, sizeof(common.reserved));
+    }
+#endif
+
+    struct android_native_base_t common;
+
+    int width;
+    int height;
+    int stride;
+    int format;
+    int usage;
+    
+    void* reserved[2];
+
+    buffer_handle_t handle;
+
+    void* reserved_proc[8];
+};
+
+
+/*****************************************************************************/
+
+#ifdef __cplusplus
+}
+#endif
+
+/*****************************************************************************/
+
+#endif /* ANDROID_ANDROID_NATIVES_PRIV_H */
diff --git a/include/ui/egl/android_natives.h b/include/ui/egl/android_natives.h
index 5842ee72ce7fe..fa3b7a0dc78d8 100644
--- a/include/ui/egl/android_natives.h
+++ b/include/ui/egl/android_natives.h
@@ -139,32 +139,6 @@ struct android_native_window_t
 };
 
 
-struct android_native_buffer_t
-{
-#ifdef __cplusplus
-    android_native_buffer_t() { 
-        common.magic = ANDROID_NATIVE_BUFFER_MAGIC;
-        common.version = sizeof(android_native_buffer_t);
-        memset(common.reserved, 0, sizeof(common.reserved));
-    }
-#endif
-
-    struct android_native_base_t common;
-
-    int width;
-    int height;
-    int stride;
-    int format;
-    int usage;
-    
-    void* reserved[2];
-
-    buffer_handle_t handle;
-
-    void* reserved_proc[8];
-};
-
-
 /* FIXME: this is legacy for pixmaps */
 struct egl_native_pixmap_t
 {
diff --git a/libs/ui/FramebufferNativeWindow.cpp b/libs/ui/FramebufferNativeWindow.cpp
index 5e69cff985c71..4e692e2c27a19 100644
--- a/libs/ui/FramebufferNativeWindow.cpp
+++ b/libs/ui/FramebufferNativeWindow.cpp
@@ -38,6 +38,8 @@
 #include <hardware/hardware.h>
 #include <hardware/gralloc.h>
 
+#include <private/ui/android_natives_priv.h>
+
 // ----------------------------------------------------------------------------
 namespace android {
 // ----------------------------------------------------------------------------
diff --git a/opengl/libagl/TextureObjectManager.cpp b/opengl/libagl/TextureObjectManager.cpp
index e5d4ed2b6f970..9deb2cf9eea41 100644
--- a/opengl/libagl/TextureObjectManager.cpp
+++ b/opengl/libagl/TextureObjectManager.cpp
@@ -19,7 +19,7 @@
 #include "context.h"
 #include "TextureObjectManager.h"
 
-#include <ui/egl/android_natives.h>
+#include <private/ui/android_natives_priv.h>
 
 namespace android {
 // ----------------------------------------------------------------------------
diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp
index 0950f3ea26666..1a774f59db223 100644
--- a/opengl/libagl/egl.cpp
+++ b/opengl/libagl/egl.cpp
@@ -39,7 +39,7 @@
 #include <pixelflinger/format.h>
 #include <pixelflinger/pixelflinger.h>
 
-#include <ui/egl/android_natives.h>
+#include <private/ui/android_natives_priv.h>
 
 #include "context.h"
 #include "state.h"
diff --git a/opengl/libagl/texture.cpp b/opengl/libagl/texture.cpp
index 0211208e2f4a2..d675107ca0b12 100644
--- a/opengl/libagl/texture.cpp
+++ b/opengl/libagl/texture.cpp
@@ -23,7 +23,7 @@
 #include "texture.h"
 #include "TextureObjectManager.h"
 
-#include <ui/egl/android_natives.h>
+#include <private/ui/android_natives_priv.h>
 
 #ifdef LIBAGL_USE_GRALLOC_COPYBITS
 #include "copybit.h"