gbm: Fix comments

[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 a0621e35231b3006b536aa580827e677b92a84e3..785b6de25c0ca6246afcc71de43fbae581ea04e8 100644 (file)
--- a/src/mesa/Android.libmesa_st_mesa.mk
+++ b/src/mesa/Android.libmesa_st_mesa.mk
@@ -31,14 +31,12 @@ LOCAL_PATH := $(call my-dir)
 # Import variables:
 #      MESA_GALLIUM_FILES.
 #      X86_FILES
-include $(LOCAL_PATH)/sources.mak
+include $(LOCAL_PATH)/Makefile.sources
 
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmesa_st_mesa
 
-MESA_ENABLED_APIS := ES1 ES2
-
 LOCAL_SRC_FILES := \
        $(MESA_GALLIUM_FILES)
 
@@ -48,11 +46,24 @@ ifeq ($(TARGET_ARCH),x86)
 endif # x86
 endif # MESA_ENABLE_ASM
 
+ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+       libmesa_sse41
+LOCAL_CFLAGS := \
+       -DUSE_SSE41
+endif
+
 LOCAL_C_INCLUDES := \
+       $(MESA_TOP)/src/mapi \
+       $(MESA_TOP)/src/mesa/main \
+       $(MESA_TOP)/src/compiler/nir \
        $(MESA_TOP)/src/gallium/auxiliary \
-       $(MESA_TOP)/src/gallium/include \
-       $(MESA_TOP)/src/glsl \
-       $(MESA_TOP)/src/mapi
+       $(MESA_TOP)/src/gallium/include
+
+LOCAL_WHOLE_STATIC_LIBRARIES += \
+       libmesa_program
+
+LOCAL_STATIC_LIBRARIES += libmesa_nir
 
 include $(LOCAL_PATH)/Android.gen.mk
 include $(MESA_COMMON_MK)