diff options
| author | Rob Herring <[email protected]> | 2016-09-01 14:06:23 -0500 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-09-06 15:58:55 +0100 |
| commit | 244f0aba16a7e197ed30e118a9978e200aee2c64 (patch) | |
| tree | 45216f18124de9ea0d07f9694a43e35f34e6ee18 /src/mesa | |
| parent | 2593354643b4bad26cd23b72a5e7073b4cad8cd0 (diff) | |
Android: glsl: add rules to generate ir_expression*.h header files
Recent changes to generate ir_expression*.h header files broke Android
builds. This adds the generation rules. This change is complicated due to
creating a circular dependency between libmesa_glsl, libmesa_nir, and
libmesa_compiler. Normally, we add static libraries so that include paths
are added even if there's no linking dependency. That is the case here.
Instead, we explicitly add the include path using $(MESA_GEN_GLSL_H) to
libmesa_compiler. This in turn requires shuffling the order of make
includes. It also uncovered missing dependency tracking of glsl_parser.h.
Signed-off-by: Rob Herring <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/Android.libmesa_dricore.mk | 6 | ||||
| -rw-r--r-- | src/mesa/Android.libmesa_st_mesa.mk | 4 | ||||
| -rw-r--r-- | src/mesa/program/Android.mk | 6 |
3 files changed, 12 insertions, 4 deletions
diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk index d7647a76bd0..86196ceb36a 100644 --- a/src/mesa/Android.libmesa_dricore.mk +++ b/src/mesa/Android.libmesa_dricore.mk @@ -60,7 +60,11 @@ LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/mesa/main \ $(MESA_TOP)/src/compiler/nir \ $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/gallium/auxiliary + $(MESA_TOP)/src/gallium/auxiliary \ + $(dir $(MESA_GEN_GLSL_H)) + +LOCAL_GENERATED_SOURCES += \ + $(MESA_GEN_GLSL_H) LOCAL_WHOLE_STATIC_LIBRARIES += \ libmesa_program diff --git a/src/mesa/Android.libmesa_st_mesa.mk b/src/mesa/Android.libmesa_st_mesa.mk index 785b6de25c0..3905ddcf246 100644 --- a/src/mesa/Android.libmesa_st_mesa.mk +++ b/src/mesa/Android.libmesa_st_mesa.mk @@ -40,6 +40,8 @@ LOCAL_MODULE := libmesa_st_mesa LOCAL_SRC_FILES := \ $(MESA_GALLIUM_FILES) +LOCAL_GENERATED_SOURCES := $(MESA_GEN_GLSL_H) + ifeq ($(strip $(MESA_ENABLE_ASM)),true) ifeq ($(TARGET_ARCH),x86) LOCAL_SRC_FILES += $(X86_FILES) @@ -63,7 +65,7 @@ LOCAL_C_INCLUDES := \ LOCAL_WHOLE_STATIC_LIBRARIES += \ libmesa_program -LOCAL_STATIC_LIBRARIES += libmesa_nir +LOCAL_STATIC_LIBRARIES += libmesa_nir libmesa_glsl include $(LOCAL_PATH)/Android.gen.mk include $(MESA_COMMON_MK) diff --git a/src/mesa/program/Android.mk b/src/mesa/program/Android.mk index 6f485439d64..c6470e6289e 100644 --- a/src/mesa/program/Android.mk +++ b/src/mesa/program/Android.mk @@ -44,7 +44,8 @@ include $(CLEAR_VARS) LOCAL_MODULE := libmesa_program LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_STATIC_LIBRARIES := libmesa_nir +LOCAL_STATIC_LIBRARIES := libmesa_nir \ + libmesa_glsl intermediates := $(call local-generated-sources-dir) @@ -80,7 +81,8 @@ LOCAL_C_INCLUDES := \ LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) -LOCAL_GENERATED_SOURCES += $(MESA_GEN_NIR_H) +LOCAL_GENERATED_SOURCES += $(MESA_GEN_NIR_H) \ + $(MESA_GEN_GLSL_H) include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) |