commit 2485e9e3412fbe9e27bb2d44950106349988dca6
author Andrew Hsieh <andrewhsieh@google.com> Sun May 06 21:26:09 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sun May 06 21:26:09 2012 -0700
tree c4ce7458982c2c818168e4ce22f080c2c4d3e5d6
parent eeed89db2546625b11bad0e8f812792c02f3cb65
parent 9d26d64c356817e2f320e8aee958012ee6c5bed5

am 9d26d64c: Merge "Emulator64-mips segfaults, disable it for now."

* commit '9d26d64c356817e2f320e8aee958012ee6c5bed5':
  Emulator64-mips segfaults, disable it for now.

android/opengles.c

diff --git a/android/opengles.c b/android/opengles.c
index 521dc03..70e3f8c 100644
--- a/android/opengles.c
+++ b/android/opengles.c
@@ -12,6 +12,7 @@
 
 #include "config-host.h"
 #include "android/opengles.h"
+#include <assert.h>
 
 /* Declared in "android/globals.h" */
 int  android_gles_fast_pipes = 1;
@@ -273,6 +274,15 @@
     return -1;
 }
 
+void android_getOpenglesHardwareStrings(char* vendor, size_t vendorBufSize,
+                                       char* renderer, size_t rendererBufSize,
+                                       char* version, size_t versionBufSize)
+{
+    assert(vendorBufSize > 0 && rendererBufSize > 0 && versionBufSize > 0);
+    assert(vendor != NULL && renderer != NULL && version != NULL);
+    vendor[0] = renderer[0] = version[0] = 0;
+}
+
 void android_stopOpenglesRenderer(void)
 {}