aboutsummaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-05-04 11:55:11 +0800
committerAndrew Hsieh <andrewhsieh@google.com>2012-05-04 12:58:37 +0800
commitafb0118a8be2a3fd271b2af51ccc13a2429a5078 (patch)
tree943accdee65410b9c490f99479dbe3b2fda9f161 /android
parentca89c96a6d07859005f3a85170842d5e395cf5d6 (diff)
downloadexternal_qemu-afb0118a8be2a3fd271b2af51ccc13a2429a5078.zip
external_qemu-afb0118a8be2a3fd271b2af51ccc13a2429a5078.tar.gz
external_qemu-afb0118a8be2a3fd271b2af51ccc13a2429a5078.tar.bz2
Fixed link-error for standalone emulator when CONFIG_ANDROID_OPENGLES == 0
Added a fake android_getOpenglesHardwareStrings (called in vl-android.c) when CONFIG_ANDROID_OPENGLES is not set or zero. This happens when ./android-configure.sh can't locate GLES include and libs. Change-Id: I1f99644adcc78b9872d7e9c6e1e7bd7b2a654119
Diffstat (limited to 'android')
-rw-r--r--android/opengles.c10
1 files changed, 10 insertions, 0 deletions
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 @@ int android_startOpenglesRenderer(int width, int height, OnPostFunc onPost, void
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)
{}