diff options
| author | Rob Herring <[email protected]> | 2017-08-15 16:37:41 -0500 |
|---|---|---|
| committer | Rob Herring <[email protected]> | 2017-08-21 10:46:21 -0500 |
| commit | 4734bfc02adad103efa1fa51e4c0f93fcaedb73c (patch) | |
| tree | f70a4146fabaeeeede9592649f773a788f245ddd /src/amd | |
| parent | ca7e31fd07a5cce9f708a48964aacf9966f912fa (diff) | |
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 <[email protected]>
Cc: 17.2 <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Signed-off-by: Qiang Yu <[email protected]>
Signed-off-by: Rob Herring <[email protected]>
Diffstat (limited to 'src/amd')
| -rw-r--r-- | src/amd/Android.common.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk index 7d08bfd31d7..4e2d0f9c2ff 100644 --- a/src/amd/Android.common.mk +++ b/src/amd/Android.common.mk @@ -55,9 +55,7 @@ LOCAL_C_INCLUDES := \ $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \ $(MESA_TOP)/src/gallium/include \ $(MESA_TOP)/src/gallium/auxiliary \ - $(intermediates)/common \ - external/llvm/include \ - external/llvm/device/include + $(intermediates)/common LOCAL_EXPORT_C_INCLUDE_DIRS := \ $(LOCAL_PATH)/common |