projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glsl: don't crash when dumping shaders if some come from cache
[mesa.git]
/
src
/
mesa
/
program
/
Android.mk
diff --git
a/src/mesa/program/Android.mk
b/src/mesa/program/Android.mk
index a237b65bc0865ddbabc0360f16fa2349885daae9..c6470e6289e2116326048c7bf54c6fd0fbec317e 100644
(file)
--- a/
src/mesa/program/Android.mk
+++ b/
src/mesa/program/Android.mk
@@
-44,8
+44,10
@@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_program
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_MODULE := libmesa_program
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_STATIC_LIBRARIES := libmesa_nir \
+ libmesa_glsl
-intermediates := $(call local-
intermediat
es-dir)
+intermediates := $(call local-
generated-sourc
es-dir)
# TODO(chadv): In Makefile.sources, move these vars to a different list so we can
# remove this kludge.
# TODO(chadv): In Makefile.sources, move these vars to a different list so we can
# remove this kludge.
@@
-55,7
+57,8
@@
generated_sources_basenames := \
program_parse.tab.h
LOCAL_SRC_FILES := \
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))
LOCAL_GENERATED_SOURCES := \
$(addprefix $(intermediates)/program/,$(generated_sources_basenames))
@@
-70,11
+73,16
@@
$(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program_lexer.l
$(local-l-to-c)
LOCAL_C_INCLUDES := \
$(local-l-to-c)
LOCAL_C_INCLUDES := \
- $(intermediates) \
- $(MESA_TOP)/src \
$(MESA_TOP)/src/mapi \
$(MESA_TOP)/src/mesa \
$(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)
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)