projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
panfrost: Prepare some code for MRT
[mesa.git]
/
src
/
mesa
/
Android.libmesa_st_mesa.mk
diff --git
a/src/mesa/Android.libmesa_st_mesa.mk
b/src/mesa/Android.libmesa_st_mesa.mk
index de2a60a70ed9662119c3816307be180dbf6119ad..16153a3c5bde01b1533350cffd5df6bc96c0fff5 100644
(file)
--- a/
src/mesa/Android.libmesa_st_mesa.mk
+++ b/
src/mesa/Android.libmesa_st_mesa.mk
@@
-42,11
+42,9
@@
LOCAL_GENERATED_SOURCES := \
$(MESA_GEN_GLSL_H) \
$(MESA_GEN_NIR_H)
$(MESA_GEN_GLSL_H) \
$(MESA_GEN_NIR_H)
-ifeq ($(strip $(MESA_ENABLE_ASM)),true)
ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES += $(X86_FILES)
endif # x86
ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES += $(X86_FILES)
endif # x86
-endif # MESA_ENABLE_ASM
ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
LOCAL_WHOLE_STATIC_LIBRARIES := \
ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
LOCAL_WHOLE_STATIC_LIBRARIES := \
@@
-63,7
+61,8
@@
LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/gallium/include
LOCAL_WHOLE_STATIC_LIBRARIES += \
$(MESA_TOP)/src/gallium/include
LOCAL_WHOLE_STATIC_LIBRARIES += \
- libmesa_program
+ libmesa_program \
+ libmesa_git_sha1
LOCAL_STATIC_LIBRARIES += libmesa_nir libmesa_glsl
LOCAL_STATIC_LIBRARIES += libmesa_nir libmesa_glsl