diff options
| author | Mauro Rossi <[email protected]> | 2017-05-03 14:35:13 -0500 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-05-11 13:52:20 +0100 |
| commit | 7e907d8f7f4490e53775267696523a092a8f6363 (patch) | |
| tree | 034a5370fd7949650407943c570594e9b65c7999 /src/gallium | |
| parent | 0b31c3adc141e35e59166e01486c3942a107841a (diff) | |
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 <[email protected]>
Signed-off-by: Rob Herring <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/targets/dri/Android.mk | 7 |
1 files changed, 1 insertions, 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 |