util/format: initialize non-important components to 0

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

diff --git a/src/mesa/program/Android.mk b/src/mesa/program/Android.mk
index 374fcbf0bf37989b8b56311b5bcd9baad46eab6a..6b4e1916747ab0b7d343eec8071af28c26a0ab13 100644 (file)
--- a/src/mesa/program/Android.mk
+++ b/src/mesa/program/Android.mk
@@ -23,7 +23,7 @@ LOCAL_PATH := $(call my-dir)
 define local-l-to-c
        @mkdir -p $(dir $@)
        @echo "Mesa Lex: $(PRIVATE_MODULE) <= $<"
-       $(hide) $(LEX) -o$@ $<
+       $(hide) $(MESA_LEX) -o$@ $<
 endef
 
 define mesa_local-y-to-c-and-h
@@ -44,8 +44,10 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmesa_program
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_STATIC_LIBRARIES := libmesa_nir \
+       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,12 +73,16 @@ $(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/compiler/nir \
        $(MESA_TOP)/src/gallium/auxiliary \
        $(MESA_TOP)/src/gallium/include
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
+
+LOCAL_GENERATED_SOURCES += $(MESA_GEN_NIR_H) \
+       $(MESA_GEN_GLSL_H)
+
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)