diff --git a/tools/emulator/opengl/host/libs/Translator/EGL/Android.mk b/tools/emulator/opengl/host/libs/Translator/EGL/Android.mk
index 8f7601b81..4e9783691 100644
--- a/tools/emulator/opengl/host/libs/Translator/EGL/Android.mk
+++ b/tools/emulator/opengl/host/libs/Translator/EGL/Android.mk
@@ -19,6 +19,7 @@ endif
 
 ifeq ($(HOST_OS),windows)
     OS_SRCS = EglWindowsApi.cpp
+    LOCAL_LDLIBS := -lopengl32 -lgdi32
 endif
 
 LOCAL_SRC_FILES :=            \
@@ -38,11 +39,21 @@ LOCAL_SRC_FILES :=            \
 
 
 LOCAL_C_INCLUDES += \
-                 $(translator_path)/include
+                 $(translator_path)/include \
+                 $(translator_path)/../../../shared
 
 LOCAL_CFLAGS := -g -O0
 LOCAL_MODULE_TAGS := debug
 LOCAL_MODULE := libEGL_translator
-LOCAL_STATIC_LIBRARIES := libGLcommon libcutils
+
+LOCAL_STATIC_LIBRARIES :=    \
+                 libcutils   \
+                 libutils    \
+                 liblog      \
+                 libOpenglOsUtils
+
+LOCAL_SHARED_LIBRARIES := \
+    libGLcommon
+
 include $(BUILD_HOST_SHARED_LIBRARY)
 
diff --git a/tools/emulator/opengl/host/libs/Translator/GLES_CM/Android.mk b/tools/emulator/opengl/host/libs/Translator/GLES_CM/Android.mk
index 8c946707a..67eab95e9 100644
--- a/tools/emulator/opengl/host/libs/Translator/GLES_CM/Android.mk
+++ b/tools/emulator/opengl/host/libs/Translator/GLES_CM/Android.mk
@@ -19,16 +19,28 @@ LOCAL_SRC_FILES :=    \
      RangeManip.cpp
 
 LOCAL_C_INCLUDES += \
-                 $(translator_path)/include
+                 $(translator_path)/include \
+                 $(translator_path)/../../../shared
 
 LOCAL_STATIC_LIBRARIES := \
-    libGLcommon           \
+    libOpenglOsUtils      \
+    libutils              \
     libcutils
 
+LOCAL_SHARED_LIBRARIES := \
+    libGLcommon
+
 LOCAL_CFLAGS := -g -O0
 LOCAL_MODULE_TAGS := debug
 LOCAL_MODULE := libGLES_CM_translator
-LOCAL_LDLIBS := -lGL
+
+ifeq ($(HOST_OS),linux)
+    LOCAL_LDLIBS := -lGL -ldl
+endif
+
+ifeq ($(HOST_OS),windows)
+    LOCAL_LDLIBS := -lopengl32 -lgdi32
+endif
 
 include $(BUILD_HOST_SHARED_LIBRARY)
 
diff --git a/tools/emulator/opengl/host/libs/Translator/GLcommon/Android.mk b/tools/emulator/opengl/host/libs/Translator/GLcommon/Android.mk
index 2ba9a381f..d1869b59a 100644
--- a/tools/emulator/opengl/host/libs/Translator/GLcommon/Android.mk
+++ b/tools/emulator/opengl/host/libs/Translator/GLcommon/Android.mk
@@ -14,8 +14,15 @@ LOCAL_SRC_FILES :=           \
 LOCAL_C_INCLUDES += \
                  $(translator_path)/include
 
+LOCAL_STATIC_LIBRARIES := \
+    libutils              \
+    libcutils
+
 LOCAL_CFLAGS := -g -O0
 LOCAL_MODULE_TAGS := debug
 LOCAL_MODULE := libGLcommon
+ifeq ($(HOST_OS),linux)
+    LOCAL_LDFLAGS := -Wl,--whole-archive
+endif
 
-include $(BUILD_HOST_STATIC_LIBRARY)
+include $(BUILD_HOST_SHARED_LIBRARY)