android: fix the building rules for Android 5.0

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

diff --git a/src/mesa/program/Android.mk b/src/mesa/program/Android.mk
index 374fcbf0bf37989b8b56311b5bcd9baad46eab6a..9a6f9629463b816f1601458a6992806c4dc3ff4d 100644 (file)
--- a/src/mesa/program/Android.mk
+++ b/src/mesa/program/Android.mk
@@ -44,8 +44,9 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmesa_program
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_STATIC_LIBRARIES := libmesa_glsl
 
-intermediates := $(call local-intermediates-dir)
+intermediates := $(call local-generated-sources-dir)
 
 # TODO(chadv): In Makefile.sources, move these vars to a different list so we can
 # remove this kludge.
@@ -71,7 +72,6 @@ $(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program_lexer.l
        $(local-l-to-c)
 
 LOCAL_C_INCLUDES := \
-       $(intermediates) \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/mesa \
        $(MESA_TOP)/src/glsl \