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 29a1b6a6373189746c6e6a4c36370ae728098967..9a6f9629463b816f1601458a6992806c4dc3ff4d 100644 (file)
--- a/src/mesa/program/Android.mk
+++ b/src/mesa/program/Android.mk
@@ -44,10 +44,9 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmesa_program
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_STATIC_LIBRARIES := libmesa_glsl
 
-intermediates := $(call local-intermediates-dir)
-
-MESA_ENABLED_APIS := ES1 ES2
+intermediates := $(call local-generated-sources-dir)
 
 # TODO(chadv): In Makefile.sources, move these vars to a different list so we can
 # remove this kludge.
@@ -57,7 +56,8 @@ generated_sources_basenames := \
        program_parse.tab.h
 
 LOCAL_SRC_FILES := \
-       $(filter-out $(generated_sources_basenames),$(subst program/,,$(PROGRAM_FILES)))
+       $(filter-out $(generated_sources_basenames),$(subst program/,,$(PROGRAM_FILES))) \
+       $(subst program/,,$(PROGRAM_NIR_FILES))
 
 LOCAL_GENERATED_SOURCES := \
        $(addprefix $(intermediates)/program/,$(generated_sources_basenames))
@@ -72,10 +72,11 @@ $(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
+       $(MESA_TOP)/src/glsl \
+       $(MESA_TOP)/src/gallium/auxiliary \
+       $(MESA_TOP)/src/gallium/include
 
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)