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 /Android.mk | |
| 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 'Android.mk')
| -rw-r--r-- | Android.mk | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Android.mk b/Android.mk index 6571161c878..7087a44a9c3 100644 --- a/Android.mk +++ b/Android.mk @@ -92,16 +92,12 @@ define mesa-build-with-llvm $(if $(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5), \ $(warning Unsupported LLVM version in Android $(MESA_ANDROID_MAJOR_VERSION)),) \ $(if $(filter 6,$(MESA_ANDROID_MAJOR_VERSION)), \ - $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_PATCH=0) \ - $(eval LOCAL_STATIC_LIBRARIES += libLLVMCore) \ - $(eval LOCAL_C_INCLUDES += external/llvm/include external/llvm/device/include),) \ + $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_PATCH=0)) \ $(if $(filter 7,$(MESA_ANDROID_MAJOR_VERSION)), \ - $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0308 -DMESA_LLVM_VERSION_PATCH=0) \ - $(eval LOCAL_STATIC_LIBRARIES += libLLVMCore) \ - $(eval LOCAL_C_INCLUDES += external/llvm/include external/llvm/device/include),) \ + $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0308 -DMESA_LLVM_VERSION_PATCH=0)) \ $(if $(filter O,$(MESA_ANDROID_MAJOR_VERSION)), \ - $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_PATCH=0) \ - $(eval LOCAL_HEADER_LIBRARIES += llvm-headers),) + $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_PATCH=0)) \ + $(eval LOCAL_SHARED_LIBRARIES += libLLVM) endef # add subdirectories |