diff options
| author | Rob Herring <[email protected]> | 2016-02-10 16:02:11 -0600 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-02-29 11:11:18 +0000 |
| commit | e90098a9cf4036bd81d085fd4bf470764f512d01 (patch) | |
| tree | 6285fa061d270ef9f81bb8a743a263e296514b46 /src/mesa/program | |
| parent | ebe784f8840dfd4d81c102acd7fcedb25e55d771 (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]>
(cherry picked from commit 574a92b048ae2b482982c3f156182970d551ca94)
Diffstat (limited to 'src/mesa/program')
| -rw-r--r-- | src/mesa/program/Android.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/program/Android.mk b/src/mesa/program/Android.mk index 0bc97a6b3d4..6f485439d64 100644 --- a/src/mesa/program/Android.mk +++ b/src/mesa/program/Android.mk @@ -44,7 +44,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libmesa_program LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_STATIC_LIBRARIES := libmesa_glsl +LOCAL_STATIC_LIBRARIES := libmesa_nir intermediates := $(call local-generated-sources-dir) @@ -74,12 +74,13 @@ $(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program_lexer.l LOCAL_C_INCLUDES := \ $(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) + include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) |