nir/opcodes: Remove the per_component info field

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

diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk
index 8a3942652996e198ce5fca6e3211d4ef41748a35..1cbc5c6d2c0668982f8c5c332f50c153ddf2f9da 100644 (file)
--- a/src/glsl/Android.mk
+++ b/src/glsl/Android.mk
@@ -39,12 +39,13 @@ LOCAL_SRC_FILES := \
        $(LIBGLSL_FILES)
 
 LOCAL_C_INCLUDES := \
-       external/astl/include \
+       $(MESA_TOP)/src \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/mesa
 
 LOCAL_MODULE := libmesa_glsl
 
+include external/stlport/libstlport.mk
 include $(LOCAL_PATH)/Android.gen.mk
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
@@ -59,10 +60,11 @@ LOCAL_SRC_FILES := \
        $(GLSL_COMPILER_CXX_FILES)
 
 LOCAL_C_INCLUDES := \
+       $(MESA_TOP)/src \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/mesa
 
-LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_glsl_utils
+LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_glsl_utils libmesa_util
 
 LOCAL_MODULE_TAGS := eng
 LOCAL_MODULE := glsl_compiler