diff options
| author | Jason Ekstrand <[email protected]> | 2016-04-13 20:25:39 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-04-13 20:25:39 -0700 |
| commit | 12f88ba32a14ea79134f4e995a55149f078a2f27 (patch) | |
| tree | 9070861dced23d0ad7dbec598bfd96b686eb7bf1 /Android.mk | |
| parent | 79fbec30fc16399ede9385ef52cb62cefbb388f4 (diff) | |
| parent | 171a570f388b2895d14f6d5418c99573cffd6369 (diff) | |
Merge remote-tracking branch 'public/master' into vulkan
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 67d894f2af1..aa4350f0a77 100644 --- a/Android.mk +++ b/Android.mk @@ -91,7 +91,6 @@ SUBDIRS := \ src/loader \ src/mapi \ src/compiler \ - src/compiler/glsl \ src/mesa \ src/util \ src/egl \ |