diff options
| author | Rob Herring <[email protected]> | 2017-04-24 11:46:58 -0500 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-04-25 17:08:06 +0100 |
| commit | 26a36c1af75f40cf225a47ee947ec6718d916a62 (patch) | |
| tree | 8a1e0f638236ce3e166cf7b2e507c0c80583bc14 /src/gallium/targets/dri | |
| parent | 347fe24f82f01511b265aaa398f9607b2dee0e45 (diff) | |
Android: fix r300g only build
If r300g is the only radeon driver built, the Android build fails to
build:
ninja: error:
'out/target/product/linaro_x86_64/obj/STATIC_LIBRARIES/libmesa_pipe_radeon_intermediates/export_includes',
needed by
'out/target/product/linaro_x86_64/obj/SHARED_LIBRARIES/gallium_dri_intermediates/import_includes',
missing and no known rule to make it
This is because the path to build libmesa_pipe_radeon was only getting
added for r600g and radeonsi, but the library dependency was added for
all radeon drivers. As libmesa_pipe_radeon is not needed for r300g, drop
the library dependency.
Cc: Mauro Rossi <[email protected]>
Signed-off-by: Rob Herring <[email protected]>
Acked-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/targets/dri')
| -rw-r--r-- | src/gallium/targets/dri/Android.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index 2385e8bf4f9..39d2b6a8983 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -52,23 +52,25 @@ 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 +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 +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_pipe_radeon libmesa_amdgpu_addrlib +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 |