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 <cwhuang@linux.org.tw>
Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Mauro Rossi 2017-05-03 14:35:13 -05:00 committed by Emil Velikov
parent 0b31c3adc1
commit 7e907d8f7f

View file

@ -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