projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Android: move libdrm settings to top-level Android.common.mk
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
Android.mk
diff --git
a/src/mesa/drivers/dri/Android.mk
b/src/mesa/drivers/dri/Android.mk
index e168fe03f84082a828ee0c5cfaf2bef6a8670f1f..72a5593fefadfea4cee78df2b6c5a900bc7f4d1a 100644
(file)
--- a/
src/mesa/drivers/dri/Android.mk
+++ b/
src/mesa/drivers/dri/Android.mk
@@
-28,34
+28,31
@@
include $(LOCAL_PATH)/common/Makefile.sources
#-----------------------------------------------
# Variables common to all DRI drivers
#-----------------------------------------------
# Variables common to all DRI drivers
-MESA_DRI_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/dri
-MESA_DRI_MODULE_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/dri
-
MESA_DRI_CFLAGS := \
-DHAVE_ANDROID_PLATFORM
MESA_DRI_C_INCLUDES := \
MESA_DRI_CFLAGS := \
-DHAVE_ANDROID_PLATFORM
MESA_DRI_C_INCLUDES := \
- $(call intermediates-dir-for,STATIC_LIBRARIES,libmesa_dri_common) \
$(addprefix $(MESA_TOP)/, $(mesa_dri_common_INCLUDES)) \
$(addprefix $(MESA_TOP)/, $(mesa_dri_common_INCLUDES)) \
+ $(MESA_TOP)/src/gallium/include \
+ $(MESA_TOP)/src/gallium/auxiliary \
external/expat/lib
MESA_DRI_WHOLE_STATIC_LIBRARIES := \
libmesa_glsl \
external/expat/lib
MESA_DRI_WHOLE_STATIC_LIBRARIES := \
libmesa_glsl \
+ libmesa_compiler \
+ libmesa_nir \
libmesa_megadriver_stub \
libmesa_dri_common \
libmesa_megadriver_stub \
libmesa_dri_common \
- libmesa_dricore
+ libmesa_dricore \
+ libmesa_util
MESA_DRI_SHARED_LIBRARIES := \
libcutils \
libdl \
MESA_DRI_SHARED_LIBRARIES := \
libcutils \
libdl \
- libdrm \
libexpat \
libglapi \
liblog
libexpat \
libglapi \
liblog
-# All DRI modules must add this to LOCAL_GENERATED_SOURCES.
-MESA_DRI_OPTIONS_H := $(call intermediates-dir-for,STATIC_LIBRARIES,libmesa_dri_common)/xmlpool/options.h
-
#-----------------------------------------------
# Build drivers and libmesa_dri_common
#-----------------------------------------------
# Build drivers and libmesa_dri_common