From: WuZhen <wuz...@jidemail.com> linking against llvm with both static and shared lib will cause problems. requires a companion changes in android llvm
Change-Id: I1d459135f7e5e242164abe38cd15f0a49448e495 Reviewed-by: Mauro Rossi <issor.or...@gmail.com> Reviewed-by: Chih-Wei Huang <cwhu...@linux.org.tw> --- src/gallium/targets/dri/Android.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index 0333641d97..972ea83530 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -118,12 +118,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := ifeq ($(MESA_ENABLE_LLVM),true) -LOCAL_STATIC_LIBRARIES += \ - libLLVMR600CodeGen \ - libLLVMR600Desc \ - libLLVMR600Info \ - libLLVMR600AsmPrinter \ - libelf +LOCAL_STATIC_LIBRARIES += libelf LOCAL_LDLIBS += $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-lgcc) endif -- 2.11.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
