From d1925fec535bdadb28b9b25aa93be880fc79918f Mon Sep 17 00:00:00 2001 From: Martin Fuzzey Date: Fri, 17 Jan 2020 17:37:03 +0100 Subject: [PATCH] etnaviv: update Android build files etnaviv no longer builds on Android, fix this. Signed-off-by: Martin Fuzzey Reviewed-by: Christian Gmeiner Tested-by: Marge Bot Part-of: --- Android.mk | 1 + src/etnaviv/Android.mk | 28 ++++++++++++++ src/etnaviv/drm/Android.mk | 46 +++++++++++++++++++++++ src/etnaviv/drm/Makefile.sources | 10 +++++ src/gallium/Android.common.mk | 1 + src/gallium/drivers/etnaviv/Android.mk | 5 ++- src/gallium/targets/dri/Android.mk | 1 + src/gallium/winsys/etnaviv/drm/Android.mk | 2 +- 8 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 src/etnaviv/Android.mk create mode 100644 src/etnaviv/drm/Android.mk create mode 100644 src/etnaviv/drm/Makefile.sources diff --git a/Android.mk b/Android.mk index ef496c1e33e..59d345b8af4 100644 --- a/Android.mk +++ b/Android.mk @@ -97,6 +97,7 @@ endef # add subdirectories SUBDIRS := \ + src/etnaviv \ src/freedreno \ src/gbm \ src/loader \ diff --git a/src/etnaviv/Android.mk b/src/etnaviv/Android.mk new file mode 100644 index 00000000000..9b949c3622d --- /dev/null +++ b/src/etnaviv/Android.mk @@ -0,0 +1,28 @@ +# Mesa 3-D graphics library +# +# Copyright (C) +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +# Android.mk for libetnaviv_* + +SUBDIRS := drm + +INC_DIRS := $(call all-named-subdir-makefiles,$(sort $(SUBDIRS))) +include $(INC_DIRS) diff --git a/src/etnaviv/drm/Android.mk b/src/etnaviv/drm/Android.mk new file mode 100644 index 00000000000..a1f55ca0582 --- /dev/null +++ b/src/etnaviv/drm/Android.mk @@ -0,0 +1,46 @@ +# Mesa 3-D graphics library +# +# Copyright (C) +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +# Android.mk for libetnaviv_drm.a + +# --------------------------------------- +# Build libetnaviv_drm +# --------------------------------------- + +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +# get C_SOURCES +include $(LOCAL_PATH)/Makefile.sources + +LOCAL_SRC_FILES := \ + $(C_SOURCES) + +LOCAL_C_INCLUDES := \ + $(MESA_TOP)/src/gallium/include \ + $(MESA_TOP)/src/gallium/auxiliary + +LOCAL_MODULE := libetnaviv_drm + +include $(MESA_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) diff --git a/src/etnaviv/drm/Makefile.sources b/src/etnaviv/drm/Makefile.sources new file mode 100644 index 00000000000..21d7f4a6cad --- /dev/null +++ b/src/etnaviv/drm/Makefile.sources @@ -0,0 +1,10 @@ +C_SOURCES := \ + etnaviv_device.c \ + etnaviv_gpu.c \ + etnaviv_bo.c \ + etnaviv_bo_cache.c \ + etnaviv_perfmon.c \ + etnaviv_pipe.c \ + etnaviv_cmd_stream.c \ + etnaviv_drmif.h \ + etnaviv_priv.h diff --git a/src/gallium/Android.common.mk b/src/gallium/Android.common.mk index 0d55f04ac94..3f7779892df 100644 --- a/src/gallium/Android.common.mk +++ b/src/gallium/Android.common.mk @@ -28,6 +28,7 @@ LOCAL_C_INCLUDES += \ $(GALLIUM_TOP)/auxiliary \ $(GALLIUM_TOP)/winsys \ $(GALLIUM_TOP)/drivers \ + $(MESA_TOP)/src/etnaviv \ $(MESA_TOP)/src/freedreno \ $(MESA_TOP)/src/freedreno/ir3 \ $(MESA_TOP)/src/freedreno/registers diff --git a/src/gallium/drivers/etnaviv/Android.mk b/src/gallium/drivers/etnaviv/Android.mk index 6976d223c21..3ba6b819f89 100644 --- a/src/gallium/drivers/etnaviv/Android.mk +++ b/src/gallium/drivers/etnaviv/Android.mk @@ -28,7 +28,10 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ $(C_SOURCES) -LOCAL_SHARED_LIBRARIES := libdrm_etnaviv +LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H) + +LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_STATIC_LIBRARIES := libmesa_nir libetnaviv_drm LOCAL_MODULE := libmesa_pipe_etnaviv include $(GALLIUM_COMMON_MK) diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index c666312b779..31d33b255d6 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -55,6 +55,7 @@ LOCAL_SHARED_LIBRARIES += \ endif LOCAL_STATIC_LIBRARIES += \ + libetnaviv_drm \ libfreedreno_drm \ libfreedreno_ir3 \ libmesa_gallium \ diff --git a/src/gallium/winsys/etnaviv/drm/Android.mk b/src/gallium/winsys/etnaviv/drm/Android.mk index 32091bea0e9..31edabd68d6 100644 --- a/src/gallium/winsys/etnaviv/drm/Android.mk +++ b/src/gallium/winsys/etnaviv/drm/Android.mk @@ -25,7 +25,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(C_SOURCES) -LOCAL_SHARED_LIBRARIES := libdrm_etnaviv +LOCAL_STATIC_LIBRARIES := libmesa_nir libetnaviv_drm LOCAL_MODULE := libmesa_winsys_etnaviv -- 2.30.2