diff options
| author | Tomasz Figa <[email protected]> | 2014-09-27 16:19:59 +0200 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-10-03 01:25:28 +0100 |
| commit | d703abf735bc2fe27af893d07e44598b8601b172 (patch) | |
| tree | 85a582f9ac5105add9326c027366c47f361755e1 /src/glsl | |
| parent | 493bfa54a57e2feddd887ba0ec3d5ef139e82f3b (diff) | |
util: Include in Android builds
This patch fixes Android build failures by including src/util directory
in compilation. Files inside of this directory are compiled into
libmesa_util static library and linked with resulting libGLES_mesa.
Signed-off-by: Tomasz Figa <[email protected]>
CC: <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk index 7b1fa7e532b..1cbc5c6d2c0 100644 --- a/src/glsl/Android.mk +++ b/src/glsl/Android.mk @@ -39,6 +39,7 @@ LOCAL_SRC_FILES := \ $(LIBGLSL_FILES) LOCAL_C_INCLUDES := \ + $(MESA_TOP)/src \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mesa @@ -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 |