projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
osmesa: don't try to bundle osmesa.def SConscript
[mesa.git]
/
Android.mk
diff --git
a/Android.mk
b/Android.mk
index 6a3014c81bb860fbfc3d4e7f25ccfb06c70f1f6f..e190f749b093735b0ff29b28268fa0bdb99716cb 100644
(file)
--- a/
Android.mk
+++ b/
Android.mk
@@
-24,20
+24,24
@@
# BOARD_GPU_DRIVERS should be defined. The valid values are
#
# classic drivers: i915 i965
# BOARD_GPU_DRIVERS should be defined. The valid values are
#
# classic drivers: i915 i965
-# gallium drivers: swrast
i915g
nouveau r300g r600g radeonsi vmwgfx
+# gallium drivers: swrast
freedreno i915g ilo
nouveau r300g r600g radeonsi vmwgfx
#
# 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)
#
# 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_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
classic_drivers := i915 i965
DRM_GRALLOC_TOP := hardware/drm_gralloc
classic_drivers := i915 i965
-gallium_drivers := swrast
i915g
nouveau r300g r600g radeonsi vmwgfx
+gallium_drivers := swrast
freedreno i915g ilo
nouveau r300g r600g radeonsi vmwgfx
MESA_GPU_DRIVERS := $(strip $(BOARD_GPU_DRIVERS))
MESA_GPU_DRIVERS := $(strip $(BOARD_GPU_DRIVERS))
@@
-73,9
+77,11
@@
endif
ifneq ($(strip $(MESA_GPU_DRIVERS)),)
SUBDIRS := \
ifneq ($(strip $(MESA_GPU_DRIVERS)),)
SUBDIRS := \
+ src/loader \
src/mapi \
src/glsl \
src/mesa \
src/mapi \
src/glsl \
src/mesa \
+ src/util \
src/egl/main
ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
src/egl/main
ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)