projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
st/mesa: use UniformBooleanTrue in glsl_to_tgsi
[mesa.git]
/
Android.mk
diff --git
a/Android.mk
b/Android.mk
index b03196ae3c5b453e2d3a3a0190ff68a8759cff29..591c2fc5143b6410516e1c080b75d0c4307a7327 100644
(file)
--- a/
Android.mk
+++ b/
Android.mk
@@
-23,22
+23,27
@@
# BOARD_GPU_DRIVERS should be defined. The valid values are
#
# BOARD_GPU_DRIVERS should be defined. The valid values are
#
-# classic drivers:
-# gallium drivers: swrast
+# classic drivers:
i915 i965
+# gallium drivers: swrast
freedreno i915g ilo nouveau r300g r600g radeonsi vmwgfx
#
#
-# The main target is libGLES_mesa. There is no classic drivers yet.
+# The main target is libGLES_mesa. For each classic driver enabled, a DRI
+# module will also be built. DRI modules will be loaded by libGLES_mesa.
MESA_TOP := $(call my-dir)
MESA_TOP := $(call my-dir)
+
+MESA_ANDROID_MAJOR_VERSION := $(word 1, $(subst ., , $(PLATFORM_VERSION)))
+MESA_ANDROID_MINOR_VERSION := $(word 2, $(subst ., , $(PLATFORM_VERSION)))
+MESA_ANDROID_VERSION := $(MESA_ANDROID_MAJOR_VERSION).$(MESA_ANDROID_MINOR_VERSION)
+
MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk
MESA_PYTHON2 := python
MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk
MESA_PYTHON2 := python
-DRM_TOP := external/drm
DRM_GRALLOC_TOP := hardware/drm_gralloc
DRM_GRALLOC_TOP := hardware/drm_gralloc
-classic_drivers :=
-gallium_drivers := swrast
+classic_drivers :=
i915 i965
+gallium_drivers := swrast
freedreno i915g ilo nouveau r300g r600g radeonsi vmwgfx
-MESA_GPU_DRIVERS := $(
BOARD_GPU_DRIVERS
)
+MESA_GPU_DRIVERS := $(
strip $(BOARD_GPU_DRIVERS)
)
# warn about invalid drivers
invalid_drivers := $(filter-out \
# warn about invalid drivers
invalid_drivers := $(filter-out \
@@
-68,24
+73,27
@@
else
MESA_BUILD_GALLIUM := false
endif
MESA_BUILD_GALLIUM := false
endif
+# add subdirectories
ifneq ($(strip $(MESA_GPU_DRIVERS)),)
ifneq ($(strip $(MESA_GPU_DRIVERS)),)
-# ---------------------------------------
-# Build libGLES_mesa
-# ---------------------------------------
-
-LOCAL_PATH := $(MESA_TOP)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES :=
-LOCAL_CFLAGS :=
-LOCAL_C_INCLUDES :=
+SUBDIRS := \
+ src/loader \
+ src/mapi \
+ src/glsl \
+ src/mesa \
+ src/egl/main
+
+ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
+SUBDIRS += \
+ src/egl/drivers/dri2 \
+ src/mesa/drivers/dri
+endif
-LOCAL_MODULE := libGLES_mesa
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
+ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
+SUBDIRS += src/gallium
+endif
-
include $(MESA_COMMON_MK
)
-include $(
BUILD_SHARED_LIBRARY
)
+
mkfiles := $(patsubst %,$(MESA_TOP)/%/Android.mk,$(SUBDIRS)
)
+include $(
mkfiles
)
-endif
# MESA_GPU_DRIVERS
+endif