diff options
| author | Chih-Wei Huang <cwhuang@android-x86.org> | 2017-05-17 13:10:02 +0800 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-05-17 14:04:18 +0100 |
| commit | bfc0c23843008fd510afa263ebe371bef3346445 (patch) | |
| tree | 5437b048730507688e9eb70f9e82c2d054d2a331 /src/util/Android.mk | |
| 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 <cwhuang@linux.org.tw>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'src/util/Android.mk')
| -rw-r--r-- | src/util/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/util/Android.mk b/src/util/Android.mk index 64aafbe2ee1..facdcf8ed11 100644 --- a/src/util/Android.mk +++ b/src/util/Android.mk @@ -34,6 +34,7 @@ LOCAL_SRC_FILES := \ $(MESA_UTIL_FILES) LOCAL_C_INCLUDES := \ + external/zlib \ $(MESA_TOP)/src/mesa \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/gallium/include \ |