projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gallium/hud: move signo declaration inside PIPE_OS_UNIX block
[mesa.git]
/
Android.mk
diff --git
a/Android.mk
b/Android.mk
index ed160fb3d0e84f8f81fdd50b49ce91dfb85de5b4..a83cb338d1827ce630f107888e5a37ea70a39471 100644
(file)
--- a/
Android.mk
+++ b/
Android.mk
@@
-24,7
+24,7
@@
# 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 freedreno i915g ilo nouveau r300g r600g radeonsi vc4 vmwgfx
+# gallium drivers: swrast freedreno i915g ilo nouveau r300g r600g radeonsi vc4 v
irgl v
mwgfx
#
# 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.
#
# 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.
@@
-42,11
+42,15
@@
$(call local-intermediates-dir)
endef
endif
endef
endif
+MESA_DRI_MODULE_REL_PATH := dri
+MESA_DRI_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/$(MESA_DRI_MODULE_REL_PATH)
+MESA_DRI_MODULE_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/$(MESA_DRI_MODULE_REL_PATH)
+
MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk
MESA_PYTHON2 := python
classic_drivers := i915 i965
MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk
MESA_PYTHON2 := python
classic_drivers := i915 i965
-gallium_drivers := swrast freedreno i915g ilo nouveau r300g r600g radeonsi vmwgfx vc4
+gallium_drivers := swrast freedreno i915g ilo nouveau r300g r600g radeonsi vmwgfx vc4
virgl
MESA_GPU_DRIVERS := $(strip $(BOARD_GPU_DRIVERS))
MESA_GPU_DRIVERS := $(strip $(BOARD_GPU_DRIVERS))
@@
-84,18
+88,23
@@
MESA_ENABLE_LLVM := $(if $(filter radeonsi,$(MESA_GPU_DRIVERS)),true,false)
ifneq ($(strip $(MESA_GPU_DRIVERS)),)
SUBDIRS := \
ifneq ($(strip $(MESA_GPU_DRIVERS)),)
SUBDIRS := \
+ src/gbm \
src/loader \
src/mapi \
src/loader \
src/mapi \
- src/
glsl
\
+ src/
compiler
\
src/mesa \
src/util \
src/egl \
src/mesa \
src/util \
src/egl \
+ src/intel/genxml \
+ src/intel/isl \
src/mesa/drivers/dri
src/mesa/drivers/dri
+INC_DIRS := $(call all-named-subdir-makefiles,$(SUBDIRS))
+
ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
-SUBDIRS += src/gallium
+INC_DIRS += $(call all-named-subdir-makefiles,src/gallium)
endif
endif
-include $(
call all-named-subdir-makefiles,$(SUBDIRS)
)
+include $(
INC_DIRS
)
endif
endif