Merge remote-tracking branch 'mesa-public/master' into vulkan

[mesa.git] / src / glsl / Android.mk

diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk
index 1cbc5c6d2c0668982f8c5c332f50c153ddf2f9da..f63b7daf26ea988facdbffef34d26bd6352c428e 100644 (file)
--- a/src/glsl/Android.mk
+++ b/src/glsl/Android.mk
@@ -27,7 +27,6 @@ LOCAL_PATH := $(call my-dir)
 
 include $(LOCAL_PATH)/Makefile.sources
 
-GLSL_SRCDIR = .
 # ---------------------------------------
 # Build libmesa_glsl
 # ---------------------------------------
@@ -36,16 +35,17 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
        $(LIBGLCPP_FILES) \
-       $(LIBGLSL_FILES)
+       $(LIBGLSL_FILES) \
+       $(NIR_FILES)
 
 LOCAL_C_INCLUDES := \
-       $(MESA_TOP)/src \
        $(MESA_TOP)/src/mapi \
-       $(MESA_TOP)/src/mesa
+       $(MESA_TOP)/src/mesa \
+       $(MESA_TOP)/src/gallium/include \
+       $(MESA_TOP)/src/gallium/auxiliary
 
 LOCAL_MODULE := libmesa_glsl
 
-include external/stlport/libstlport.mk
 include $(LOCAL_PATH)/Android.gen.mk
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
@@ -60,9 +60,10 @@ LOCAL_SRC_FILES := \
        $(GLSL_COMPILER_CXX_FILES)
 
 LOCAL_C_INCLUDES := \
-       $(MESA_TOP)/src \
        $(MESA_TOP)/src/mapi \
-       $(MESA_TOP)/src/mesa
+       $(MESA_TOP)/src/mesa \
+       $(MESA_TOP)/src/gallium/include \
+       $(MESA_TOP)/src/gallium/auxiliary
 
 LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_glsl_utils libmesa_util