diff options
| author | Mauro Rossi <[email protected]> | 2019-09-21 17:58:52 +0200 |
|---|---|---|
| committer | Mauro Rossi <[email protected]> | 2019-09-28 15:56:34 +0200 |
| commit | 411e50a8fd0301067f2a67732dbf432177019704 (patch) | |
| tree | f3e3eb0b287f2ed8537e39fec63bc1167a7712bb /src/amd/vulkan | |
| parent | 268fb10e9c9a2943e42349d39f20f681a915150e (diff) | |
android: aco: add support for libmesa_aco
Android building rules are added in src/amd/Android.compiler.mk
libmesa_aco static library is built conditionally to radeonsi
as done for vulkan.radv module
This will prevent Android build errors for non x86 systems
filter-out compiler/aco_instruction_selection_setup.cpp source,
as already included by compiler/aco_instruction_selection.cpp
and would cause several multiple definition linker errors
NOTE: libLLVM requires AMDGPU Disassembler to build radv with aco
Fixes: 93c8ebf ("aco: Initial commit of independent AMD compiler")
Fixes: a70a998 ("radv/aco: Setup alternate path in RADV to support the experimental ACO compiler")
Signed-off-by: Mauro Rossi <[email protected]>
Diffstat (limited to 'src/amd/vulkan')
| -rw-r--r-- | src/amd/vulkan/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/amd/vulkan/Android.mk b/src/amd/vulkan/Android.mk index d0002b8aac5..f01e10f9003 100644 --- a/src/amd/vulkan/Android.mk +++ b/src/amd/vulkan/Android.mk @@ -67,6 +67,7 @@ $(call mesa-build-with-llvm) LOCAL_C_INCLUDES := $(RADV_COMMON_INCLUDES) LOCAL_STATIC_LIBRARIES := \ + libmesa_aco \ libmesa_amd_common \ libmesa_nir \ libmesa_util \ @@ -167,7 +168,8 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ libmesa_amdgpu_addrlib \ libmesa_amd_common \ libmesa_radv_common \ - libmesa_vulkan_util + libmesa_vulkan_util \ + libmesa_aco LOCAL_SHARED_LIBRARIES += $(RADV_SHARED_LIBRARIES) libz libsync liblog |