diff options
| author | Chih-Wei Huang <[email protected]> | 2015-05-20 11:25:29 +0800 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2015-06-09 11:38:45 -0700 |
| commit | ac296aee58158ccf1953e812a04f99eb5f8eb57b (patch) | |
| tree | b762716ff8f3ac35c3cf731550a546d8169d0718 /Android.mk | |
| parent | 933df3d3350867282d7334c94abf1ec677d78029 (diff) | |
android: Depend on gallium_dri from EGL, instead of linking in gallium.
The Android gallium build used to use gallium_egl, which was removed back
in March. Instead, we will now use a normal Mesa libEGL loader with
dlopen()ing of a DRI module.
v2: add a clean step to rebuild all dri modules properly.
v3: Squish the 2 patches doing this together (change by anholt).
Signed-off-by: Chih-Wei Huang <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk index b19419ba7c2..6a09a9db177 100644 --- a/Android.mk +++ b/Android.mk @@ -89,13 +89,9 @@ SUBDIRS := \ src/glsl \ src/mesa \ src/util \ - src/egl/main - -ifeq ($(strip $(MESA_BUILD_CLASSIC)),true) -SUBDIRS += \ + src/egl/main \ src/egl/drivers/dri2 \ src/mesa/drivers/dri -endif ifeq ($(strip $(MESA_BUILD_GALLIUM)),true) SUBDIRS += src/gallium |