projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
v3d/tex: handle correctly coordinates for cube/cubearrays images
[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 bbd39562785472f991fd1b5759613bf3d99d9d4b..16153a3c5bde01b1533350cffd5df6bc96c0fff5 100644
(file)
--- a/
src/mesa/Android.libmesa_st_mesa.mk
+++ b/
src/mesa/Android.libmesa_st_mesa.mk
@@
-24,8
+24,6
@@
# libmesa_st_mesa.a
# ----------------------------------------------------------------------
# libmesa_st_mesa.a
# ----------------------------------------------------------------------
-ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
-
LOCAL_PATH := $(call my-dir)
# Import variables:
LOCAL_PATH := $(call my-dir)
# Import variables:
@@
-40,11
+38,13
@@
LOCAL_MODULE := libmesa_st_mesa
LOCAL_SRC_FILES := \
$(MESA_GALLIUM_FILES)
LOCAL_SRC_FILES := \
$(MESA_GALLIUM_FILES)
-ifeq ($(strip $(MESA_ENABLE_ASM)),true)
+LOCAL_GENERATED_SOURCES := \
+ $(MESA_GEN_GLSL_H) \
+ $(MESA_GEN_NIR_H)
+
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 := \
@@
-61,10
+61,11
@@
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
include $(LOCAL_PATH)/Android.gen.mk
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
include $(LOCAL_PATH)/Android.gen.mk
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif # MESA_BUILD_GALLIUM