diff options
| author | Mauro Rossi <[email protected]> | 2019-06-21 19:50:45 +0200 |
|---|---|---|
| committer | Mauro Rossi <[email protected]> | 2019-06-29 16:25:01 +0200 |
| commit | c237654dca131be938d11a2565d402a600cfa618 (patch) | |
| tree | 32aa927bb59492db07f66a3edd11528d1db8d77b /src/gallium/drivers | |
| parent | 5847de6e9afe12bd29ad694a76860a0575ab4747 (diff) | |
android: virgl: fix generated virgl_driinfo.h building rules
Changelog in Android makefile:
- Add LOCAL_MODULE_CLASS, intermediates and LOCAL_GENERATED_SOURCES
- Use LOCAL_EXPORT_C_INCLUDE_DIRS to export $(intermediates) path
- Move generated header rules before 'include $(BUILD_STATIC_LIBRARY)'
Fixes 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:257:16:
fatal error: 'virgl/virgl_driinfo.h' file not found
#include "virgl/virgl_driinfo.h"
^~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
Fixes: cf800998a ("virgl: Add driinfo file and tie it into the build")
Signed-off-by: Mauro Rossi <[email protected]>
Review-by: Chih-Wei Huang <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/virgl/Android.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/gallium/drivers/virgl/Android.mk b/src/gallium/drivers/virgl/Android.mk index f77bcf196eb..c06c16558c3 100644 --- a/src/gallium/drivers/virgl/Android.mk +++ b/src/gallium/drivers/virgl/Android.mk @@ -30,8 +30,9 @@ LOCAL_SRC_FILES := \ LOCAL_MODULE := libmesa_pipe_virgl -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) +LOCAL_MODULE_CLASS := STATIC_LIBRARIES +intermediates := $(call local-generated-sources-dir) +LOCAL_GENERATED_SOURCES := $(intermediates)/virgl/virgl_driinfo.h GEN_DRIINFO_INPUTS := \ $(MESA_TOP)/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h \ @@ -44,6 +45,11 @@ $(intermediates)/virgl/virgl_driinfo.h: $(MERGE_DRIINFO) $(GEN_DRIINFO_INPUTS) @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" $(hide) $(MESA_PYTHON2) $(MERGE_DRIINFO) $(GEN_DRIINFO_INPUTS) > $@ || ($(RM) $@; false) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) + +include $(GALLIUM_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) + ifneq ($(HAVE_GALLIUM_VIRGL),) GALLIUM_TARGET_DRIVERS += virtio_gpu $(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_virgl_common libmesa_winsys_virgl libmesa_winsys_virgl_vtest) |