diff options
Diffstat (limited to 'src/gallium/targets/Android.mk')
| -rw-r--r-- | src/gallium/targets/Android.mk | 148 |
1 files changed, 56 insertions, 92 deletions
diff --git a/src/gallium/targets/Android.mk b/src/gallium/targets/Android.mk index 110284c3c9..2101cd3495 100644 --- a/src/gallium/targets/Android.mk +++ b/src/gallium/targets/Android.mk @@ -1,16 +1,24 @@ +# Android.mk for Gallium EGL and gralloc + LOCAL_PATH := $(call my-dir) -gles_SRC_FILES := \ - egl-gdi/egl-static.c +# EGL +include $(CLEAR_VARS) -gles_CFLAGS := \ +LOCAL_SRC_FILES := \ + egl-static/egl.c \ + egl-static/egl_pipe.c \ + egl-static/egl_st.c + +LOCAL_CFLAGS := \ -DFEATURE_ES1=1 \ -DFEATURE_ES2=1 \ -DGALLIUM_SOFTPIPE \ + -D_EGL_MAIN=_eglBuiltInDriverGALLIUM \ -fvisibility=hidden \ -Wno-sign-compare -gles_C_INCLUDES := \ +LOCAL_C_INCLUDES := \ external/mesa/include \ external/mesa/src/gallium/include \ external/mesa/src/gallium/auxiliary \ @@ -21,136 +29,92 @@ gles_C_INCLUDES := \ external/mesa/src/egl/main \ external/mesa/src/mesa -gles_STATIC_LIBRARIES := \ +LOCAL_STATIC_LIBRARIES := \ libmesa_st_egl \ libmesa_winsys_sw \ libmesa_pipe_softpipe \ libmesa_st_mesa \ libmesa_glsl \ libmesa_st_mesa \ - libmesa_talloc \ libmesa_gallium -gles_WHOLE_STATIC_LIBRARIES := \ - libmesa_egl \ - libmesa_glapi +LOCAL_WHOLE_STATIC_LIBRARIES := \ + libmesa_egl -gles_SHARED_LIBRARIES := \ +LOCAL_SHARED_LIBRARIES := \ + libglapi \ libdl \ libhardware \ liblog \ libcutils -gralloc_SRC_FILES := - -gralloc_CFLAGS := \ - -fvisibility=hidden \ - -Wno-sign-compare - -gralloc_C_INCLUDES := \ - external/mesa/src/gallium/include \ - external/mesa/src/gallium/auxiliary \ - external/mesa/src/gallium/drivers \ - external/mesa/src/gallium/winsys - -gralloc_STATIC_LIBRARIES := \ - libmesa_gallium - -gralloc_WHOLE_STATIC_LIBRARIES := \ - libmesa_st_gralloc - -gralloc_SHARED_LIBRARIES := \ - libdl \ - liblog \ - libcutils \ - libdrm \ - libEGL - -ifeq ($(strip $(MESA_BUILD_SWRAST)),true) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(gles_SRC_FILES) - -LOCAL_CFLAGS := \ - $(gles_CFLAGS) - -LOCAL_C_INCLUDES := \ - $(gles_C_INCLUDES) - -LOCAL_STATIC_LIBRARIES := \ - $(gles_STATIC_LIBRARIES) - -LOCAL_WHOLE_STATIC_LIBRARIES := \ - $(gles_WHOLE_STATIC_LIBRARIES) - -LOCAL_SHARED_LIBRARIES := \ - $(gles_SHARED_LIBRARIES) - -LOCAL_MODULE := libGLES_swrast -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl - -include $(BUILD_SHARED_LIBRARY) -endif # MESA_BUILD_SWRAST +ifeq ($(strip $(MESA_BUILD_CLASSIC)),true) +LOCAL_STATIC_LIBRARIES := \ + libmesa_classic_egl \ + $(LOCAL_STATIC_LIBRARIES) +LOCAL_SHARED_LIBRARIES += libdrm +endif # MESA_BUILD_CLASSIC ifeq ($(strip $(MESA_BUILD_I915G)),true) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(gles_SRC_FILES) \ - egl/pipe_i915.c - -LOCAL_CFLAGS := \ - $(gles_CFLAGS) \ - -DFEATURE_DRM=1 - -LOCAL_C_INCLUDES := \ - $(gles_C_INCLUDES) - +LOCAL_CFLAGS += -D_EGL_PIPE_I915 LOCAL_STATIC_LIBRARIES := \ libmesa_winsys_i915 \ libmesa_pipe_i915 \ - $(gles_STATIC_LIBRARIES) - -LOCAL_WHOLE_STATIC_LIBRARIES := \ - $(gles_WHOLE_STATIC_LIBRARIES) - -LOCAL_SHARED_LIBRARIES := \ - $(gles_SHARED_LIBRARIES) \ + $(LOCAL_STATIC_LIBRARIES) +LOCAL_SHARED_LIBRARIES += \ libdrm \ libdrm_intel +endif # MESA_BUILD_I915G -LOCAL_MODULE := libGLES_i915g +ifeq ($(strip $(MESA_BUILD_R600G)),true) +LOCAL_CFLAGS += -D_EGL_PIPE_R600 +LOCAL_STATIC_LIBRARIES := \ + libmesa_pipe_r600 \ + libmesa_winsys_r600 \ + $(LOCAL_STATIC_LIBRARIES) +LOCAL_SHARED_LIBRARIES += \ + libdrm \ + libdrm_radeon +endif # MESA_BUILD_R600G + +LOCAL_MODULE := libGLES_mesa LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl include $(BUILD_SHARED_LIBRARY) -endif # MESA_BUILD_I915G +# gralloc (broken!) ifeq ($(strip $(MESA_BUILD_VMWGFX)),true) include $(CLEAR_VARS) -LOCAL_SRC_FILES := \ - egl/pipe_vmwgfx.c \ - $(gralloc_SRC_FILES) +LOCAL_SRC_FILES := egl/egl_pipe.c LOCAL_CFLAGS := \ - $(gralloc_CFLAGS) + -D_EGL_PIPE_VMWGFX=1 \ + -fvisibility=hidden \ + -Wno-sign-compare LOCAL_C_INCLUDES := \ - $(gralloc_C_INCLUDES) + external/mesa/src/gallium/include \ + external/mesa/src/gallium/auxiliary \ + external/mesa/src/gallium/drivers \ + external/mesa/src/gallium/winsys LOCAL_STATIC_LIBRARIES := \ libmesa_pipe_svga \ libmesa_winsys_svga \ - $(gralloc_STATIC_LIBRARIES) + libmesa_gallium LOCAL_WHOLE_STATIC_LIBRARIES := \ - $(gralloc_WHOLE_STATIC_LIBRARIES) + libmesa_st_gralloc LOCAL_SHARED_LIBRARIES := \ - $(gralloc_SHARED_LIBRARIES) + libdl \ + liblog \ + libcutils \ + libdrm \ + libEGL -LOCAL_MODULE := gralloc.vmwgfx +LOCAL_MODULE := gralloc.mesa LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw include $(BUILD_SHARED_LIBRARY) |