diff options
author | Mauro Rossi <[email protected]> | 2019-06-15 07:39:02 +0200 |
---|---|---|
committer | Mauro Rossi <[email protected]> | 2019-06-21 15:53:29 +0200 |
commit | 60c581b57d9ce5f56900cdbd6cd7f02d125f0635 (patch) | |
tree | 4a023c2b8c5248a6eb34cdb176f7a4b478e6bfca /src/gallium/winsys | |
parent | cf389ba89507b20dee1ac640b3a496aa86f82ac1 (diff) |
android: virgl: fix libmesa_winsys_virgil_common build and dependencies
Fixes the following building errors and resolves Bug 110922
Fixes gallium_dri target missing symbols at linking.
external/mesa/src/gallium/winsys/virgl/drm/Android.mk:
error: libmesa_winsys_virgl (STATIC_LIBRARIES android-x86_64) missing libmesa_winsys_virgl_common (STATIC_LIBRARIES android-x86_64)
...
external/mesa/src/gallium/winsys/virgl/vtest/Android.mk:
error: libmesa_winsys_virgl_vtest (STATIC_LIBRARIES android-x86_64) missing libmesa_winsys_virgl_common (STATIC_LIBRARIES android-x86_64)
...
build/core/main.mk:728: error: exiting from previous errors.
In file included from external/mesa/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c:34:
external/mesa/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h:35:10:
fatal error: 'virgl_resource_cache.h' file not found
^~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
In file included from external/mesa/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c:32:
external/mesa/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h:35:10:
fatal error: 'virgl_resource_cache.h' file not found
#include "virgl_resource_cache.h"
^~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
Fixes: b18f09a ("virgl: Introduce virgl_resource_cache")
Signed-off-by: Mauro Rossi <[email protected]>
Reviewed-by: Tapani Pälli <[email protected]>
Tested-by: Clayton Craft <[email protected]>
Diffstat (limited to 'src/gallium/winsys')
-rw-r--r-- | src/gallium/winsys/virgl/drm/Android.mk | 2 | ||||
-rw-r--r-- | src/gallium/winsys/virgl/vtest/Android.mk | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/winsys/virgl/drm/Android.mk b/src/gallium/winsys/virgl/drm/Android.mk index 5e2500774e7..398a7645bc4 100644 --- a/src/gallium/winsys/virgl/drm/Android.mk +++ b/src/gallium/winsys/virgl/drm/Android.mk @@ -27,6 +27,8 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(C_SOURCES) +LOCAL_C_INCLUDES := $(GALLIUM_TOP)/winsys/virgl/common + LOCAL_MODULE := libmesa_winsys_virgl LOCAL_STATIC_LIBRARIES := libmesa_winsys_virgl_common diff --git a/src/gallium/winsys/virgl/vtest/Android.mk b/src/gallium/winsys/virgl/vtest/Android.mk index 5b33f677114..6d35223c8e6 100644 --- a/src/gallium/winsys/virgl/vtest/Android.mk +++ b/src/gallium/winsys/virgl/vtest/Android.mk @@ -27,6 +27,8 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(C_SOURCES) +LOCAL_C_INCLUDES := $(GALLIUM_TOP)/winsys/virgl/common + LOCAL_MODULE := libmesa_winsys_virgl_vtest LOCAL_STATIC_LIBRARIES := libmesa_winsys_virgl_common |