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/compiler/Android.mk | |
| 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/compiler/Android.mk')
| -rw-r--r-- | src/compiler/Android.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/compiler/Android.mk b/src/compiler/Android.mk index ac0ced58334..1e81ca54642 100644 --- a/src/compiler/Android.mk +++ b/src/compiler/Android.mk @@ -22,7 +22,8 @@ LOCAL_PATH := $(call my-dir) -include $(LOCAL_PATH)/Makefile.sources +include $(LOCAL_PATH)/Android.glsl.mk +include $(LOCAL_PATH)/Android.nir.mk # --------------------------------------- # Build libmesa_compiler @@ -30,19 +31,22 @@ include $(LOCAL_PATH)/Makefile.sources include $(CLEAR_VARS) +include $(LOCAL_PATH)/Makefile.sources LOCAL_SRC_FILES := $(LIBCOMPILER_FILES) LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mesa \ $(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_MODULE := libmesa_compiler include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) -include $(LOCAL_PATH)/Android.glsl.mk -include $(LOCAL_PATH)/Android.nir.mk |