Mesa (master): android: freedreno/common: add support for libfreedreno_common static

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: ca114e62735b04a5beccb09fb40a787f63e8324a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ca114e62735b04a5beccb09fb40a787f63e8324a

Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Thu Jul 30 23:18:51 2020 +0200

android: freedreno/common: add support for libfreedreno_common static

Porting of meson build rules to Android

Fixes: 9623debf48a ("freedreno: Centralize UUID generation into new files freedreno_uuid.c/h")
Signed-off-by: Mauro Rossi <issor.oruam at gmail.com>
Acked-by: Rob Clark <robdclark at gmail.com>
Acked-by: Eric Engestrom <eric at engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6151>

---

 src/freedreno/Android.common.mk          | 41 ++++++++++++++++++++++++++++++++
 src/freedreno/Android.mk                 |  1 +
 src/freedreno/Makefile.sources           |  6 +++++
 src/gallium/drivers/freedreno/Android.mk |  3 ++-
 4 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/src/freedreno/Android.common.mk b/src/freedreno/Android.common.mk
new file mode 100644
index 00000000000..2bbf09b4088
--- /dev/null
+++ b/src/freedreno/Android.common.mk
@@ -0,0 +1,41 @@
+# 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 libfreedreno_common.a
+
+# ---------------------------------------
+# Build libfreedreno_common
+# ---------------------------------------
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+	$(common_SOURCES)
+
+LOCAL_C_INCLUDES := \
+	$(MESA_TOP)/src/gallium/include \
+	$(MESA_TOP)/src/gallium/auxiliary
+
+LOCAL_MODULE := libfreedreno_common
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/src/freedreno/Android.mk b/src/freedreno/Android.mk
index 3d76c40f6b5..84fe2eeda7b 100644
--- a/src/freedreno/Android.mk
+++ b/src/freedreno/Android.mk
@@ -25,6 +25,7 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(LOCAL_PATH)/Makefile.sources
+include $(LOCAL_PATH)/Android.common.mk
 include $(LOCAL_PATH)/Android.drm.mk
 include $(LOCAL_PATH)/Android.ir3.mk
 include $(LOCAL_PATH)/Android.perfcntrs.mk
diff --git a/src/freedreno/Makefile.sources b/src/freedreno/Makefile.sources
index 99d9ace4a73..0768667e0c1 100644
--- a/src/freedreno/Makefile.sources
+++ b/src/freedreno/Makefile.sources
@@ -1,3 +1,9 @@
+common_SOURCES := \
+	common/disasm.h \
+	common/freedreno_uuid.c \
+	common/freedreno_uuid.h \
+	common/freedreno_guardband.h
+
 drm_SOURCES := \
 	drm/freedreno_bo.c \
 	drm/freedreno_drmif.h \
diff --git a/src/gallium/drivers/freedreno/Android.mk b/src/gallium/drivers/freedreno/Android.mk
index c41165cb248..ee4d06af612 100644
--- a/src/gallium/drivers/freedreno/Android.mk
+++ b/src/gallium/drivers/freedreno/Android.mk
@@ -39,7 +39,8 @@ LOCAL_SRC_FILES := \
 
 LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/ir3 \
-	$(MESA_TOP)/include
+	$(MESA_TOP)/include \
+	$(MESA_TOP)/src/freedreno/common
 
 LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H)