ilo: prepare for image init for imported bo

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

diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk
index f975d03d1bbcdee345bab1c83837c327ef2ab23c..f20741e0d0fc1259eb45191e368b43af7a3fd9d9 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
 # ---------------------------------------
@@ -37,46 +36,21 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := \
        $(LIBGLCPP_FILES) \
        $(LIBGLSL_FILES) \
-       $(LIBGLSL_CXX_FILES)
+       $(NIR_FILES)
 
 LOCAL_C_INCLUDES := \
-       external/astl/include \
        $(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)
 
-# ---------------------------------------
-# Build mesa_builtin_compiler for host
-# ---------------------------------------
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-       $(LIBGLCPP_FILES) \
-       $(LIBGLSL_FILES) \
-       $(LIBGLSL_CXX_FILES) \
-       $(GLSL_SRCDIR)/builtin_compiler/builtin_stubs.cpp \
-       $(GLSL_COMPILER_CXX_FILES)
-
-LOCAL_C_INCLUDES := \
-       $(MESA_TOP)/src/mapi \
-       $(MESA_TOP)/src/mesa
-
-LOCAL_STATIC_LIBRARIES := libmesa_glsl_utils
-
-LOCAL_MODULE := mesa_builtin_compiler
-
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_IS_HOST_MODULE := true
-include $(LOCAL_PATH)/Android.gen.mk
-include $(MESA_COMMON_MK)
-include $(BUILD_HOST_EXECUTABLE)
-
 # ---------------------------------------
 # Build glsl_compiler
 # ---------------------------------------
@@ -88,9 +62,11 @@ LOCAL_SRC_FILES := \
 
 LOCAL_C_INCLUDES := \
        $(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
+LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_glsl_utils libmesa_util
 
 LOCAL_MODULE_TAGS := eng
 LOCAL_MODULE := glsl_compiler