From 7e907d8f7f4490e53775267696523a092a8f6363 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Wed, 3 May 2017 14:35:13 -0500 Subject: [PATCH] Android: drop static linking of R600 LLVM libraries Inspired by Chih-Wei Huang and Zhen Wu similar patches Linking against llvm with both static and shared may be avoided, provided that libLLVM shared library for device supports whole static R600/AMDGPU libraries, necessary for radeonsi/amdgpu. Complementary changes, limited to android external/llvm project are necessary to correclty build libLLVM Tested with marshmallow-x86 and nougat-x86 builds Reviewed-by: Chih-Wei Huang Signed-off-by: Rob Herring Reviewed-by: Emil Velikov --- 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 39d2b6a8983..f5f0124882f 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -108,12 +108,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 += -lgcc endif -- 2.30.2