Android: Fix LLVM duplicated symbols linking for N and M
authorRob Herring <robh@kernel.org>
Tue, 15 Aug 2017 21:37:41 +0000 (16:37 -0500)
committerRob Herring <robh@kernel.org>
Mon, 21 Aug 2017 15:46:21 +0000 (10:46 -0500)
commit4734bfc02adad103efa1fa51e4c0f93fcaedb73c
treef70a4146fabaeeeede9592649f773a788f245ddd
parentca7e31fd07a5cce9f708a48964aacf9966f912fa
Android: Fix LLVM duplicated symbols linking for N and M

Both statically linking libLLVMCore and dynamically linking libLLVM causes
duplicated symbols in gallium_dri.so and it fails to dlopen. We don't
really need to link libLLVMCore, but just need generated headers to be
built first. Dynamically linking to libLLVM instead is enough to do
that. Thanks to Qiang Yu for finding the root cause.

With this change, we can align all versions and just have libLLVM as a
shared lib dependency.

This also requires changes in the M and N versions of LLVM to export the
include paths for libLLVM. AOSP master is okay.

Fixes: 26aee6f4d5a ("Android: rework LLVM build support")
Reported-by: Mauro Rossi <issor.oruam@gmail.com>
Cc: 17.2 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Android.mk
src/amd/Android.common.mk
src/gallium/drivers/radeon/Android.mk
src/gallium/drivers/radeonsi/Android.mk