diff options
| author | Rob Herring <[email protected]> | 2017-05-03 14:35:20 -0500 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-05-11 13:52:21 +0100 |
| commit | 3f097396a1642bb7033002d0bdd37e194afce06a (patch) | |
| tree | 8a4bd04f538b8622325f18b9b26053256a44da63 /src/gallium/targets/dri | |
| parent | 2a2dabe1c330fea311505b453de58ddcd5488fcc (diff) | |
Android: push driver build details to driver makefiles
src/gallium/targets/dri/Android.mk contains lots of conditional for
individual drivers. Let's move these details into the individual driver
makefiles.
In the process, align the make driver conditionals with automake
(i.e. HAVE_GALLIUM_*).
Signed-off-by: Rob Herring <[email protected]>
[Emil Velikov: add the radeon winsys for radeonsi]
Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/targets/dri')
| -rw-r--r-- | src/gallium/targets/dri/Android.mk | 60 |
1 files changed, 6 insertions, 54 deletions
diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index f5f0124882f..e95e24a2317 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -37,62 +37,11 @@ LOCAL_SHARED_LIBRARIES := \ libglapi \ libexpat -ifneq ($(filter freedreno,$(MESA_GPU_DRIVERS)),) -LOCAL_CFLAGS += -DGALLIUM_FREEDRENO -gallium_DRIVERS += libmesa_winsys_freedreno libmesa_pipe_freedreno -LOCAL_SHARED_LIBRARIES += libdrm_freedreno -endif -ifneq ($(filter i915g,$(MESA_GPU_DRIVERS)),) -gallium_DRIVERS += libmesa_winsys_i915 libmesa_pipe_i915 -LOCAL_SHARED_LIBRARIES += libdrm_intel -LOCAL_CFLAGS += -DGALLIUM_I915 -endif -ifneq ($(filter nouveau,$(MESA_GPU_DRIVERS)),) -gallium_DRIVERS += libmesa_winsys_nouveau libmesa_pipe_nouveau -LOCAL_CFLAGS += -DGALLIUM_NOUVEAU -LOCAL_SHARED_LIBRARIES += libdrm_nouveau -endif - -ifneq ($(filter r%,$(MESA_GPU_DRIVERS)),) -ifneq ($(filter r300g,$(MESA_GPU_DRIVERS)),) -gallium_DRIVERS += libmesa_pipe_r300 -LOCAL_CFLAGS += -DGALLIUM_R300 -endif -ifneq ($(filter r600g,$(MESA_GPU_DRIVERS)),) -gallium_DRIVERS += libmesa_pipe_r600 libmesa_pipe_radeon -LOCAL_CFLAGS += -DGALLIUM_R600 -endif -ifneq ($(filter radeonsi,$(MESA_GPU_DRIVERS)),) -gallium_DRIVERS += libmesa_pipe_radeonsi libmesa_winsys_amdgpu libmesa_amd_common libmesa_pipe_radeon -LOCAL_SHARED_LIBRARIES += libLLVM libdrm_amdgpu -LOCAL_CFLAGS += -DGALLIUM_RADEONSI -endif -gallium_DRIVERS += libmesa_winsys_radeon libmesa_amdgpu_addrlib -LOCAL_SHARED_LIBRARIES += libdrm_radeon -endif - -ifneq ($(filter swrast,$(MESA_GPU_DRIVERS)),) -gallium_DRIVERS += libmesa_pipe_softpipe libmesa_winsys_sw_dri -LOCAL_CFLAGS += -DGALLIUM_SOFTPIPE -endif -ifneq ($(filter vc4,$(MESA_GPU_DRIVERS)),) -LOCAL_CFLAGS += -DGALLIUM_VC4 -gallium_DRIVERS += libmesa_winsys_vc4 libmesa_pipe_vc4 -endif -ifneq ($(filter virgl,$(MESA_GPU_DRIVERS)),) -LOCAL_CFLAGS += -DGALLIUM_VIRGL -gallium_DRIVERS += libmesa_winsys_virgl libmesa_winsys_virgl_vtest libmesa_pipe_virgl -endif -ifneq ($(filter vmwgfx,$(MESA_GPU_DRIVERS)),) -gallium_DRIVERS += libmesa_winsys_svga libmesa_pipe_svga -LOCAL_CFLAGS += -DGALLIUM_VMWGFX -endif -ifneq ($(filter nouveau r600g,$(MESA_GPU_DRIVERS)),) -LOCAL_SHARED_LIBRARIES += libc++ -endif +$(foreach d, $(MESA_BUILD_GALLIUM), $(eval LOCAL_CFLAGS += $(patsubst HAVE_%,-D%,$(d)))) +# sort GALLIUM_LIBS to remove any duplicates LOCAL_WHOLE_STATIC_LIBRARIES := \ - $(gallium_DRIVERS) \ + $(sort $(GALLIUM_LIBS)) \ libmesa_st_dri \ libmesa_st_mesa \ libmesa_glsl \ @@ -105,6 +54,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ libmesa_util \ libmesa_loader +# sort GALLIUM_SHARED_LIBS to remove any duplicates +LOCAL_SHARED_LIBRARIES += $(sort $(GALLIUM_SHARED_LIBS)) + LOCAL_STATIC_LIBRARIES := ifeq ($(MESA_ENABLE_LLVM),true) |