fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 11:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

android: radeonsi: prepare for driver-specific driconf options

Browse source 
Android build changes to avoid the following building error:

In file included from external/mesa/src/gallium/targets/dri/target.c:1:
external/mesa/src/gallium/auxiliary/target-helpers/drm_helper.h:185:10:
fatal error: 'radeonsi/si_driinfo.h' file not found
         ^
1 error generated.

Fixes: 0f8c5de869 "radeonsi: prepare for driver-specific driconf options"
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Mauro Rossi 2017-08-03 02:55:48 +02:00 • committed by Emil Velikov
parent 56eb2f3570
commit 5baed8f0e6
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/auxiliary/pipe-loader/Android.mk
View file

@ -39,7 +39,7 @@ LOCAL_SRC_FILES := \
LOCAL_MODULE := libmesa_pipe_loader
LOCAL_STATIC_LIBRARIES := libmesa_loader
LOCAL_STATIC_LIBRARIES := libmesa_loader libmesa_util
include $(GALLIUM_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)

17
src/gallium/drivers/radeonsi/Android.mk
View file

@ -43,6 +43,23 @@ LOCAL_STATIC_LIBRARIES := libmesa_amd_common
LOCAL_SHARED_LIBRARIES := libdrm_radeon libLLVM
LOCAL_MODULE := libmesa_pipe_radeonsi
intermediates := $(call local-generated-sources-dir)
LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/radeonsi/,$(GENERATED_SOURCES))
GEN_DRIINFO_INPUTS := \
$(MESA_TOP)/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h \
$(LOCAL_PATH)/driinfo_radeonsi.h
MERGE_DRIINFO := $(MESA_TOP)/src/util/merge_driinfo.py
$(intermediates)/radeonsi/si_driinfo.h: $(MERGE_DRIINFO) $(GEN_DRIINFO_INPUTS)
@mkdir -p $(dir $@)
@echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"
$(hide) $(MESA_PYTHON2) $(MERGE_DRIINFO) $(GEN_DRIINFO_INPUTS) > $@ || ($(RM) $@; false)
LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
$(call mesa-build-with-llvm)
include $(GALLIUM_COMMON_MK)