diff --git a/tools/emulator/opengl/host/libs/GLESv1_dec/Android.mk b/tools/emulator/opengl/host/libs/GLESv1_dec/Android.mk
new file mode 100644
index 000000000..c251e4a79
--- /dev/null
+++ b/tools/emulator/opengl/host/libs/GLESv1_dec/Android.mk
@@ -0,0 +1,44 @@
+
+LOCAL_PATH := $(call my-dir)
+
+### GLESv1 Decoder ###########################################
+include $(CLEAR_VARS)
+
+emulatorOpengl := $(LOCAL_PATH)/../../..
+EMUGEN := $(HOST_OUT_EXECUTABLES)/emugen
+
+LOCAL_IS_HOST_MODULE := true
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_TAGS := debug
+LOCAL_MODULE := libGLESv1_dec
+
+intermediates := $(local-intermediates-dir)
+
+LOCAL_SRC_FILES := \
+        GLDecoder.cpp
+
+LOCAL_C_INCLUDES += \
+    $(emulatorOpengl)/system/OpenglCodecCommon \
+    $(emulatorOpengl)/system/GLESv1_enc
+
+LOCAL_STATIC_LIBRARIES := \
+        libOpenglCodecCommon \
+        liblog
+
+# XXX - uncomment for debug
+#LOCAL_CFLAGS := -DDEBUG_PRINTOUT -O0 -g
+LOCAL_LDLIBS := -ldl
+
+
+GEN := $(intermediates)/gl_dec.cpp $(intermediates)/gl_dec.h
+
+$(GEN) : PRIVATE_PATH := $(LOCAL_PATH)
+$(GEN) : PRIVATE_CUSTOM_TOOL := $(EMUGEN) -D $(intermediates) -i $(emulatorOpengl)/system/GLESv1_enc gl
+$(GEN) : $(EMUGEN) \
+        $(emulatorOpengl)/system/GLESv1_enc/gl.attrib \
+        $(emulatorOpengl)/system/GLESv1_enc/gl.in \
+        $(emulatorOpengl)/system/GLESv1_enc/gl.types
+	$(transform-generated-source)
+
+LOCAL_GENERATED_SOURCES += $(GEN)
+include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/tools/emulator/opengl/host/libs/GLESv1_dec/GLDecoder.cpp b/tools/emulator/opengl/host/libs/GLESv1_dec/GLDecoder.cpp
new file mode 100644
index 000000000..dfa14c93f
--- /dev/null
+++ b/tools/emulator/opengl/host/libs/GLESv1_dec/GLDecoder.cpp
@@ -0,0 +1,195 @@
+/*
+* Copyright (C) 2011 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.
+*/
+#include "GLDecoder.h"
+#include <string.h>
+#include <dlfcn.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <EGL/egl.h>
+#include <GLES/gl.h>
+#include <GLES/glext.h>
+
+GLDecoder::GLDecoder()
+{
+    m_contextData = NULL;
+    m_glesDso = NULL;
+}
+
+GLDecoder::~GLDecoder()
+{
+    if (m_glesDso != NULL) {
+        dlclose(m_glesDso);
+    }
+}
+
+
+int GLDecoder::initGL(get_proc_func_t getProcFunc, void *getProcFuncData)
+{
+    if (getProcFunc == NULL) {
+        char *libname = GLES_LIBNAME;
+        if (getenv(GLES_LIBNAME_VAR) != NULL) {
+            libname = getenv(GLES_LIBNAME_VAR);
+        }
+
+        m_glesDso = dlopen(libname, RTLD_NOW);
+        if (m_glesDso == NULL) {
+            fprintf(stderr, "Couldn't find %s \n", GLES_LIBNAME);
+            return -1;
+        }
+
+        this->initDispatchByName(s_getProc, this);
+    } else {
+        this->initDispatchByName(getProcFunc, getProcFuncData);
+    }
+
+    set_glGetCompressedTextureFormats(s_glGetCompressedTextureFormats);
+    set_glVertexPointerOffset(s_glVertexPointerOffset);
+    set_glColorPointerOffset(s_glColorPointerOffset);
+    set_glNormalPointerOffset(s_glNormalPointerOffset);
+    set_glTexCoordPointerOffset(s_glTexCoordPointerOffset);
+    set_glPointSizePointerOffset(s_glPointSizePointerOffset);
+
+    set_glVertexPointerData(s_glVertexPointerData);
+    set_glColorPointerData(s_glColorPointerData);
+    set_glNormalPointerData(s_glNormalPointerData);
+    set_glTexCoordPointerData(s_glTexCoordPointerData);
+    set_glPointSizePointerData(s_glPointSizePointerData);
+
+    set_glDrawElementsOffset(s_glDrawElementsOffset);
+    set_glDrawElementsData(s_glDrawElementsData);
+
+    return 0;
+}
+
+void GLDecoder::s_glVertexPointerOffset(void *self, GLint size, GLenum type, GLsizei stride, GLuint offset)
+{
+    GLDecoder *ctx = (GLDecoder *)self;
+    ctx->glVertexPointer(size, type, stride, (void *)offset);
+}
+
+void GLDecoder::s_glColorPointerOffset(void *self, GLint size, GLenum type, GLsizei stride, GLuint offset)
+{
+    GLDecoder *ctx = (GLDecoder *)self;
+    ctx->glColorPointer(size, type, stride, (void *)offset);
+}
+
+void GLDecoder::s_glTexCoordPointerOffset(void *self, GLint size, GLenum type, GLsizei stride, GLuint offset)
+{
+    GLDecoder *ctx = (GLDecoder *)self;
+    ctx->glTexCoordPointer(size, type, stride, (void *) offset);
+}
+
+void GLDecoder::s_glNormalPointerOffset(void *self, GLenum type, GLsizei stride, GLuint offset)
+{
+    GLDecoder *ctx = (GLDecoder *)self;
+    ctx->glNormalPointer(type, stride, (void *)offset);
+}
+
+void GLDecoder::s_glPointSizePointerOffset(void *self, GLenum type, GLsizei stride, GLuint offset)
+{
+    GLDecoder *ctx = (GLDecoder *)self;
+    ctx->glPointSizePointerOES(type, stride, (void *)offset);
+}
+
+#define STORE_POINTER_DATA_OR_ABORT(location)    \
+    if (ctx->m_contextData != NULL) {   \
+        ctx->m_contextData->storePointerData((location), data, datalen); \
+    } else { \
+        return; \
+    }
+
+void GLDecoder::s_glVertexPointerData(void *self, GLint size, GLenum type, GLsizei stride, void *data, GLuint datalen)
+{
+    GLDecoder *ctx = (GLDecoder *)self;
+
+    STORE_POINTER_DATA_OR_ABORT(GLDecoderContextData::VERTEX_LOCATION);
+
+    ctx->glVertexPointer(size, type, 0, ctx->m_contextData->pointerData(GLDecoderContextData::VERTEX_LOCATION));
+}
+
+void GLDecoder::s_glColorPointerData(void *self, GLint size, GLenum type, GLsizei stride, void *data, GLuint datalen)
+{
+    GLDecoder *ctx = (GLDecoder *)self;
+
+    STORE_POINTER_DATA_OR_ABORT(GLDecoderContextData::COLOR_LOCATION);
+
+    ctx->glColorPointer(size, type, 0, ctx->m_contextData->pointerData(GLDecoderContextData::COLOR_LOCATION));
+}
+
+void GLDecoder::s_glTexCoordPointerData(void *self, GLint unit, GLint size, GLenum type, GLsizei stride, void *data, GLuint datalen)
+{
+    GLDecoder *ctx = (GLDecoder *)self;
+    STORE_POINTER_DATA_OR_ABORT((GLDecoderContextData::PointerDataLocation)
+                                (GLDecoderContextData::TEXCOORD0_LOCATION + unit));
+
+    ctx->glTexCoordPointer(size, type, 0,
+                           ctx->m_contextData->pointerData((GLDecoderContextData::PointerDataLocation)
+                                                           (GLDecoderContextData::TEXCOORD0_LOCATION + unit)));
+}
+
+void GLDecoder::s_glNormalPointerData(void *self, GLenum type, GLsizei stride, void *data, GLuint datalen)
+{
+    GLDecoder *ctx = (GLDecoder *)self;
+
+    STORE_POINTER_DATA_OR_ABORT(GLDecoderContextData::NORMAL_LOCATION);
+
+    ctx->glNormalPointer(type, 0, ctx->m_contextData->pointerData(GLDecoderContextData::NORMAL_LOCATION));
+}
+
+void GLDecoder::s_glPointSizePointerData(void *self, GLenum type, GLsizei stride, void *data, GLuint datalen)
+{
+    GLDecoder *ctx = (GLDecoder *)self;
+
+    STORE_POINTER_DATA_OR_ABORT(GLDecoderContextData::POINTSIZE_LOCATION);
+
+    ctx->glPointSizePointerOES(type, 0, ctx->m_contextData->pointerData(GLDecoderContextData::POINTSIZE_LOCATION));
+}
+
+void GLDecoder::s_glDrawElementsOffset(void *self, GLenum mode, GLsizei count, GLenum type, GLuint offset)
+{
+    GLDecoder *ctx = (GLDecoder *)self;
+    ctx->glDrawElements(mode, count, type, (void *)offset);
+}
+
+void GLDecoder::s_glDrawElementsData(void *self, GLenum mode, GLsizei count, GLenum type, void * data, GLuint datalen)
+{
+    GLDecoder *ctx = (GLDecoder *)self;
+    ctx->glDrawElements(mode, count, type, data);
+}
+
+void GLDecoder::s_glGetCompressedTextureFormats(void *self, GLint count, GLint *data)
+{
+    GLDecoder *ctx = (GLDecoder *) self;
+    ctx->glGetIntegerv(GL_COMPRESSED_TEXTURE_FORMATS, data);
+}
+
+void *GLDecoder::s_getProc(const char *name, void *userData)
+{
+    GLDecoder *ctx = (GLDecoder *)userData;
+
+    if (ctx == NULL || ctx->m_glesDso == NULL) {
+        return NULL;
+    }
+
+    void *func = NULL;
+#ifdef USE_EGL_GETPROCADDRESS
+    func = (void *) eglGetProcAddress(name);
+#endif
+    if (func == NULL) {
+        func = dlsym(ctx->m_glesDso, name);
+    }
+    return func;
+}
diff --git a/tools/emulator/opengl/host/libs/GLESv1_dec/GLDecoder.h b/tools/emulator/opengl/host/libs/GLESv1_dec/GLDecoder.h
new file mode 100644
index 000000000..10e4968dc
--- /dev/null
+++ b/tools/emulator/opengl/host/libs/GLESv1_dec/GLDecoder.h
@@ -0,0 +1,62 @@
+/*
+* Copyright (C) 2011 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 _GL_DECODER_H_
+#define _GL_DECODER_H_
+
+#include "gl_dec.h"
+#include "FixedBuffer.h"
+#include "GLDecoderContextData.h"
+
+#define GLES_LIBNAME_VAR "ANDROID_GLESv1_LIB"
+#define GLES_LIBNAME "libGLES_CM.so"
+
+class GLDecoder : public gl_decoder_context_t
+{
+public:
+    typedef void *(*get_proc_func_t)(const char *name, void *userData);
+
+    GLDecoder();
+    ~GLDecoder();
+    int initGL(get_proc_func_t getProcFunc = NULL, void *getProcFuncData = NULL);
+    void setContextData(GLDecoderContextData *contextData) { m_contextData = contextData; }
+
+private:
+    static void s_glGetCompressedTextureFormats(void * self, GLint cont, GLint *data);
+    static void s_glVertexPointerData(void *self, GLint size, GLenum type, GLsizei stride, void *data, GLuint datalen);
+    static void s_glVertexPointerOffset(void *self, GLint size, GLenum type, GLsizei stride, GLuint offset);
+
+    static void s_glColorPointerData(void *self, GLint size, GLenum type, GLsizei stride, void *data, GLuint datalen);
+    static void s_glColorPointerOffset(void *self, GLint size, GLenum type, GLsizei stride, GLuint offset);
+
+    static void s_glTexCoordPointerData(void *self, GLint unit, GLint size, GLenum type, GLsizei stride, void *data, GLuint datalen);
+    static void s_glTexCoordPointerOffset(void *self, GLint size, GLenum type, GLsizei stride, GLuint offset);
+
+    static void s_glNormalPointerData(void *self, GLenum type, GLsizei stride, void *data, GLuint datalen);
+    static void s_glNormalPointerOffset(void *self, GLenum type, GLsizei stride, GLuint offset);
+
+    static void s_glPointSizePointerData(void *self, GLenum type, GLsizei stride, void *data, GLuint datalen);
+    static void s_glPointSizePointerOffset(void *self, GLenum type, GLsizei stride, GLuint offset);
+
+    static void s_glDrawElementsOffset(void *self, GLenum mode, GLsizei count, GLenum type, GLuint offset);
+    static void s_glDrawElementsData(void *self, GLenum mode, GLsizei count, GLenum type, void * data, GLuint datalen);
+
+    static void * s_getProc(const char *name, void *userData);
+
+    GLDecoderContextData *m_contextData;
+    void *m_glesDso;
+};
+
+#endif