[Mesa-dev] [PATCH] Android: correct libz dependency

[Emil Velikov]

On 17 May 2017 at 13:45, Rob Herring <robh at kernel.org> wrote:
> On Wed, May 17, 2017 at 12:10 AM, Chih-Wei Huang
> <cwhuang at android-x86.org> wrote:
>> 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 at linux.org.tw>
>> ---
>>  Android.common.mk                  | 4 ----
>>  src/gallium/targets/dri/Android.mk | 3 ++-
>>  src/intel/Android.vulkan.mk        | 2 +-
>>  src/mesa/drivers/dri/Android.mk    | 3 ++-
>>  src/util/Android.mk                | 1 +
>>  5 files changed, 6 insertions(+), 7 deletions(-)
>
> Reviewed-by: Rob Herring <robh at kernel.org>
Thanks Rob. Pushed to master.

-Emil