diff options
Diffstat (limited to 'src/mesa/drivers/Android.mk')
| -rw-r--r-- | src/mesa/drivers/Android.mk | 56 |
1 files changed, 24 insertions, 32 deletions
diff --git a/src/mesa/drivers/Android.mk b/src/mesa/drivers/Android.mk index 00de3c1a82..7fb540af11 100644 --- a/src/mesa/drivers/Android.mk +++ b/src/mesa/drivers/Android.mk @@ -1,15 +1,6 @@ -LOCAL_PATH := $(call my-dir) +# Android.mk for DRI drivers -# from dri/Makefile.template -COMMON_SOURCES = \ - dri/common/utils.c \ - dri/common/vblank.c \ - dri/common/dri_util.c \ - dri/common/xmlconfig.c \ - dri/common/texmem.c \ - dri/common/drirenderbuffer.c \ - dri/common/dri_metaops.c \ - common/driverfuncs.c +LOCAL_PATH := $(call my-dir) # from dri/i915/Makefile i915_DRIVER_SOURCES = \ @@ -59,6 +50,7 @@ i915_DRIVER_SOURCES = \ intel_fbo.c i915_DRIVER_SOURCES := $(addprefix dri/i915/, $(i915_DRIVER_SOURCES)) +# from dri/i965/Makefile i965_DRIVER_SOURCES = \ intel_batchbuffer.c \ intel_blit.c \ @@ -158,11 +150,22 @@ i965_CXX_SOURCES = \ brw_fs.cpp \ brw_fs_channel_expressions.cpp \ brw_fs_reg_allocate.cpp \ + brw_fs_schedule_instructions.cpp \ brw_fs_vector_splitting.cpp i965_DRIVER_SOURCES := \ $(addprefix dri/i965/, $(i965_DRIVER_SOURCES)) \ $(addprefix dri/i965/, $(i965_CXX_SOURCES)) +# from dri/Makefile.template +common_SOURCES = \ + dri/common/utils.c \ + dri/common/vblank.c \ + dri/common/dri_util.c \ + dri/common/xmlconfig.c \ + dri/common/texmem.c \ + dri/common/drirenderbuffer.c \ + common/driverfuncs.c + common_CFLAGS := \ -DPTHREADS \ -DFEATURE_GL=1 \ @@ -175,7 +178,6 @@ common_C_INCLUDES := \ external/mesa/include \ external/mesa/src/mapi \ external/mesa/src/glsl \ - external/mesa/src/talloc \ external/mesa/src/mesa \ external/mesa/src/mesa/drivers/dri/common \ external/drm/ \ @@ -185,27 +187,23 @@ common_C_INCLUDES := \ common_STATIC_LIBRARIES := \ libmesa_classic_mesa \ libmesa_glsl \ - libmesa_classic_mesa \ - libmesa_talloc \ - libmesa_classic_egl - -common_WHOLE_STATIC_LIBRARIES := \ - libmesa_egl \ - libmesa_glapi + libmesa_classic_mesa common_SHARED_LIBRARIES := \ + libglapi \ libdl \ libdrm \ libexpat \ - libhardware \ liblog \ libcutils +common_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/dri + ifeq ($(strip $(MESA_BUILD_I915C)),true) include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - $(COMMON_SOURCES) \ + $(common_SOURCES) \ $(i915_DRIVER_SOURCES) LOCAL_CFLAGS := \ @@ -220,15 +218,12 @@ LOCAL_C_INCLUDES := \ LOCAL_STATIC_LIBRARIES := \ $(common_STATIC_LIBRARIES) -LOCAL_WHOLE_STATIC_LIBRARIES := \ - $(common_WHOLE_STATIC_LIBRARIES) - LOCAL_SHARED_LIBRARIES := \ $(common_SHARED_LIBRARIES) \ libdrm_intel -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl -LOCAL_MODULE := libGLES_i915c +LOCAL_MODULE := i915_dri +LOCAL_MODULE_PATH := $(common_MODULE_PATH) include $(BUILD_SHARED_LIBRARY) endif # MESA_BUILD_I915C @@ -237,7 +232,7 @@ ifeq ($(strip $(MESA_BUILD_I965C)),true) include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - $(COMMON_SOURCES) \ + $(common_SOURCES) \ $(i965_DRIVER_SOURCES) LOCAL_CFLAGS := \ @@ -252,15 +247,12 @@ LOCAL_C_INCLUDES := \ LOCAL_STATIC_LIBRARIES := \ $(common_STATIC_LIBRARIES) -LOCAL_WHOLE_STATIC_LIBRARIES := \ - $(common_WHOLE_STATIC_LIBRARIES) - LOCAL_SHARED_LIBRARIES := \ $(common_SHARED_LIBRARIES) \ libdrm_intel -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl -LOCAL_MODULE := libGLES_i965c +LOCAL_MODULE := i965_dri +LOCAL_MODULE_PATH := $(common_MODULE_PATH) include $(BUILD_SHARED_LIBRARY) endif # MESA_BUILD_I965C |