diff --git a/tools/emulator/opengl/host/renderer/Android.mk b/tools/emulator/opengl/host/renderer/Android.mk
index 934931b5f..55fcb8040 100644
--- a/tools/emulator/opengl/host/renderer/Android.mk
+++ b/tools/emulator/opengl/host/renderer/Android.mk
@@ -1,31 +1,14 @@
 LOCAL_PATH:=$(call my-dir)
 
 # host renderer process ###########################
-include $(CLEAR_VARS)
+$(call emugl-begin-host-executable,emulator_renderer)
+$(call emugl-import,libOpenglRender)
+LOCAL_SRC_FILES := main.cpp
+LOCAL_CFLAGS    += -O0 -g
 
-emulatorOpengl := $(LOCAL_PATH)/../..
+#ifeq ($(HOST_OS),windows)
+#LOCAL_LDLIBS += -lws2_32
+#endif
 
-LOCAL_MODULE := emulator_renderer
-LOCAL_MODULE_TAGS := debug
+$(call emugl-end-module)
 
-LOCAL_SRC_FILES := \
-    main.cpp
-
-LOCAL_CFLAGS += -g -O0
-
-LOCAL_C_INCLUDES := $(emulatorOpengl)/host/include \
-                    $(emulatorOpengl)/host/include/libOpenglRender \
-                    $(emulatorOpengl)/shared/OpenglOsUtils \
-                    $(emulatorOpengl)/shared/OpenglCodecCommon \
-                    $(emulatorOpengl)/host/libs/libOpenglRender
-
-ifeq ($(HOST_OS),windows)
-LOCAL_LDLIBS += -lws2_32
-endif
-
-LOCAL_SHARED_LIBRARIES := libOpenglRender \
-        libGLESv1_dec \
-        libGLESv2_dec \
-        lib_renderControl_dec
-
-include $(BUILD_HOST_EXECUTABLE)