diff options
| author | Mauro Rossi <[email protected]> | 2017-08-03 02:55:48 +0200 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-08-03 10:55:29 +0100 |
| commit | 5baed8f0e64e5154d77ccd96ebe2d933a579e7f3 (patch) | |
| tree | 12ebfda331ceba35cd3132e57f1cc17acdb96748 | |
| parent | 56eb2f35702a946c17d6ebae4373f107058417c6 (diff) | |
android: radeonsi: prepare for driver-specific driconf options
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 <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/pipe-loader/Android.mk | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/Android.mk | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/pipe-loader/Android.mk b/src/gallium/auxiliary/pipe-loader/Android.mk index 1e1bb11153f..ab844143c30 100644 --- a/src/gallium/auxiliary/pipe-loader/Android.mk +++ b/src/gallium/auxiliary/pipe-loader/Android.mk @@ -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) diff --git a/src/gallium/drivers/radeonsi/Android.mk b/src/gallium/drivers/radeonsi/Android.mk index 6fff91f6f75..4a5df5b01d8 100644 --- a/src/gallium/drivers/radeonsi/Android.mk +++ b/src/gallium/drivers/radeonsi/Android.mk @@ -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) |