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 d7d17dd6d9afa66d6e0df1f5c8c0d9b5f4fa7ee3..1cbc5c6d2c0668982f8c5c332f50c153ddf2f9da 100644 (file)
--- a/src/glsl/Android.mk
+++ b/src/glsl/Android.mk
@@ -27,6 +27,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(LOCAL_PATH)/Makefile.sources
 
+GLSL_SRCDIR = .
 # ---------------------------------------
 # Build libmesa_glsl
 # ---------------------------------------
@@ -34,47 +35,21 @@ include $(LOCAL_PATH)/Makefile.sources
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
-       $(LIBGLCPP_SOURCES) \
-       $(LIBGLSL_SOURCES) \
-       $(LIBGLSL_CXX_SOURCES)
+       $(LIBGLCPP_FILES) \
+       $(LIBGLSL_FILES)
 
 LOCAL_C_INCLUDES := \
+       $(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)
 
-# ---------------------------------------
-# Build mesa_builtin_compiler for host
-# ---------------------------------------
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-       $(LIBGLCPP_SOURCES) \
-       $(LIBGLSL_SOURCES) \
-       $(LIBGLSL_CXX_SOURCES) \
-       $(BUILTIN_COMPILER_CXX_SOURCES) \
-       $(GLSL_COMPILER_CXX_SOURCES)
-
-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
 # ---------------------------------------
@@ -82,13 +57,14 @@ include $(BUILD_HOST_EXECUTABLE)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
-       $(GLSL_COMPILER_CXX_SOURCES)
+       $(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