diff options
| author | Rob Herring <[email protected]> | 2016-02-10 16:02:11 -0600 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-02-29 10:51:44 +0000 |
| commit | 574a92b048ae2b482982c3f156182970d551ca94 (patch) | |
| tree | e42747ca8701dcae159986c0235a3808c6d413c7 /src/compiler | |
| parent | a640ad15e1fff3eb51f42bf30c31eafe02a921e2 (diff) | |
Android: fix build break from nir/glsl move to compiler/
Commits a39a8fbbaa12 ("nir: move to compiler/") and eb63640c1d38
("glsl: move to compiler/") broke Android builds. Fix them.
There is also a missing dependency between generated NIR headers and
several libraries. This isn't a new issue, but seems to have been
exposed by the NIR move.
Built with i915, i965, freedreno, r300g, r600g, vc4, and virgl enabled.
Cc: "11.2" <[email protected]>
Cc: Mauro Rossi <[email protected]>
Signed-off-by: Rob Herring <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/Android.gen.mk | 4 | ||||
| -rw-r--r-- | src/compiler/glsl/Android.gen.mk | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/Android.mk | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/compiler/Android.gen.mk b/src/compiler/Android.gen.mk index fcd5f94d459..96fc750ec64 100644 --- a/src/compiler/Android.gen.mk +++ b/src/compiler/Android.gen.mk @@ -42,6 +42,10 @@ LOCAL_EXPORT_C_INCLUDE_DIRS += \ LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ $(NIR_GENERATED_FILES)) +# Modules using libmesa_nir must set LOCAL_GENERATED_SOURCES to this +MESA_GEN_NIR_H := $(addprefix $(call local-generated-sources-dir)/, \ + nir/nir_opcodes.h \ + nir/nir_builder_opcodes.h) nir_builder_opcodes_gen := $(LOCAL_PATH)/nir/nir_builder_opcodes_h.py nir_builder_opcodes_deps := \ diff --git a/src/compiler/glsl/Android.gen.mk b/src/compiler/glsl/Android.gen.mk index c5741b40bc5..c0902b27f32 100644 --- a/src/compiler/glsl/Android.gen.mk +++ b/src/compiler/glsl/Android.gen.mk @@ -33,7 +33,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) LOCAL_C_INCLUDES += \ $(intermediates)/glcpp \ - $(MESA_TOP)/src/glsl/glcpp \ + $(LOCAL_PATH)/glcpp \ LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ $(LIBGLCPP_GENERATED_FILES) \ diff --git a/src/compiler/glsl/Android.mk b/src/compiler/glsl/Android.mk index 9cbb9a339a1..f5d96b300f0 100644 --- a/src/compiler/glsl/Android.mk +++ b/src/compiler/glsl/Android.mk @@ -36,7 +36,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ $(LIBGLCPP_FILES) \ $(LIBGLSL_FILES) \ - $(NIR_FILES) LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/mapi \ @@ -67,7 +66,7 @@ LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/gallium/include \ $(MESA_TOP)/src/gallium/auxiliary -LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_glsl_utils libmesa_util +LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_glsl_utils libmesa_util libmesa_compiler LOCAL_MODULE_TAGS := eng LOCAL_MODULE := glsl_compiler |