aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/Android.libmesa_glsl_utils.mk
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2015-04-15 13:40:55 +0100
committerEmil Velikov <[email protected]>2015-06-12 15:32:18 +0100
commit1df5a6c71ee4a3c08b5da3f8bae24880af16b74c (patch)
tree31e6a68b178dde0bd05c739f4bf9f5ffd7008bb4 /src/mesa/Android.libmesa_glsl_utils.mk
parent4722743f4b920c6986a7148ef3ce76b4fd12db46 (diff)
mesa; add a dummy _mesa_error_no_memory() symbol to libglsl_util
Rather than forcing everyone to provide their own definition of the symbol provide a common (dummy) one. This helps us resolve the build of the standalone pipe-drivers (amongst others), which are missing the symbol. Cc: Rob Clark <[email protected]> Cc: "10.6" <[email protected]> Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/mesa/Android.libmesa_glsl_utils.mk')
-rw-r--r--src/mesa/Android.libmesa_glsl_utils.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/Android.libmesa_glsl_utils.mk b/src/mesa/Android.libmesa_glsl_utils.mk
index 3497377af8c..ed620ac648c 100644
--- a/src/mesa/Android.libmesa_glsl_utils.mk
+++ b/src/mesa/Android.libmesa_glsl_utils.mk
@@ -44,7 +44,8 @@ LOCAL_C_INCLUDES := \
LOCAL_SRC_FILES := \
main/imports.c \
program/prog_hash_table.c \
- program/symbol_table.c
+ program/symbol_table.c \
+ program/dummy_errors.c
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
@@ -68,7 +69,8 @@ LOCAL_C_INCLUDES := \
LOCAL_SRC_FILES := \
main/imports.c \
program/prog_hash_table.c \
- program/symbol_table.c
+ program/symbol_table.c \
+ program/dummy_errors.c
include $(MESA_COMMON_MK)
include $(BUILD_HOST_STATIC_LIBRARY)