diff options
| author | Chih-Wei Huang <[email protected]> | 2017-05-17 13:10:02 +0800 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-05-17 14:04:18 +0100 |
| commit | bfc0c23843008fd510afa263ebe371bef3346445 (patch) | |
| tree | 5437b048730507688e9eb70f9e82c2d054d2a331 /src/gallium | |
| parent | f96edf72b49348176b5eea0bdfe114e260dd3f99 (diff) | |
Android: correct libz dependency
Commit 6facb0c0 ("android: fix libz dynamic library dependencies")
unconditionally adds libz as a dependency to all shared libraries.
That is unnecessary.
Commit 85a9b1b5 introduced libz as a dependency to libmesa_util.
So only the shared libraries that use libmesa_util need libz.
Fix Android Lollipop build by adding the include path of zlib to
libmesa_util explicitly instead of getting the path implicitly
from zlib since it doesn't export the include path in Lollipop.
Fixes: 6facb0c0 "android: fix libz dynamic library dependencies"
Signed-off-by: Chih-Wei Huang <[email protected]>
Reviewed-by: Tapani Pälli <[email protected]>
Reviewed-by: Rob Herring <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/targets/dri/Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index f72551c51cb..8c8fb5d3d1c 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -35,7 +35,8 @@ LOCAL_CFLAGS := LOCAL_SHARED_LIBRARIES := \ libdl \ libglapi \ - libexpat + libexpat \ + libz $(foreach d, $(MESA_BUILD_GALLIUM), $(eval LOCAL_CFLAGS += $(patsubst HAVE_%,-D%,$(d)))) |