diff options
| author | Rob Herring <robh@kernel.org> | 2016-02-10 16:02:11 -0600 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-02-29 10:51:44 +0000 |
| commit | 574a92b048ae2b482982c3f156182970d551ca94 (patch) | |
| tree | e42747ca8701dcae159986c0235a3808c6d413c7 /src/mesa/Android.mesa_gen_matypes.mk | |
| parent | a640ad15e1fff3eb51f42bf30c31eafe02a921e2 (diff) | |
| download | external_mesa3d-574a92b048ae2b482982c3f156182970d551ca94.zip external_mesa3d-574a92b048ae2b482982c3f156182970d551ca94.tar.gz external_mesa3d-574a92b048ae2b482982c3f156182970d551ca94.tar.bz2 | |
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" <mesa-stable@lists.freedesktop.org>
Cc: Mauro Rossi <issor.oruam@gmail.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'src/mesa/Android.mesa_gen_matypes.mk')
| -rw-r--r-- | src/mesa/Android.mesa_gen_matypes.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/Android.mesa_gen_matypes.mk b/src/mesa/Android.mesa_gen_matypes.mk index 6e301f9..4fcf73a 100644 --- a/src/mesa/Android.mesa_gen_matypes.mk +++ b/src/mesa/Android.mesa_gen_matypes.mk @@ -35,8 +35,7 @@ LOCAL_MODULE := mesa_gen_matypes LOCAL_IS_HOST_MODULE := true LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/glsl + $(MESA_TOP)/src/mapi LOCAL_SRC_FILES := \ x86/gen_matypes.c |