summaryrefslogtreecommitdiff
path: root/src/mapi
diff options
context:
space:
mode:
authorJason Ekstrand <jason@jlekstrand.net>2021-06-07 11:40:11 -0500
committerJason Ekstrand <jason@jlekstrand.net>2021-07-08 14:44:02 -0500
commitd4b482d378e34b3f17005bc6244f24bdd73e94a0 (patch)
tree293b34c7ae57e27fc82fb34cda2658152a96fed0 /src/mapi
parentc5478f9067f2751981ad02cdc9d6af90fdfb4462 (diff)
android: Drop the Android.mk build system
Android.mk files haven't really been supported by Mesa devs for a long time. Most of us have been willing to update Makefile.sources if we remember and sometimes we try to blind code some Android.mk for a new generator. However, the reality is that it breaks regularly and ends up being maintained by the Android community. To address this problem another approach was implemented in !10183 utilizing the maintained meson build system. The old Android.mk files are no longer required. This commit was created with the following commands: git rm **/Android.mk git rm **/Android.*.mk git rm **/Makefile.sources git rm CleanSpec.mk Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4487 Acked-by: Roman Stratiienko <r.stratiienko@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9728>
Diffstat (limited to 'src/mapi')
-rw-r--r--src/mapi/Android.mk81
-rw-r--r--src/mapi/Makefile.sources38
2 files changed, 0 insertions, 119 deletions
diff --git a/src/mapi/Android.mk b/src/mapi/Android.mk
deleted file mode 100644
index 9405d2ac3d5..00000000000
--- a/src/mapi/Android.mk
+++ /dev/null
@@ -1,81 +0,0 @@
-# Mesa 3-D graphics library
-#
-# Copyright (C) 2010-2011 Chia-I Wu <olvaffe@gmail.com>
-# Copyright (C) 2010-2011 LunarG Inc.
-#
-# 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 glapi
-
-LOCAL_PATH := $(call my-dir)
-
-mapi_abi_headers :=
-
-# ---------------------------------------
-# Build libglapi
-# ---------------------------------------
-
-include $(CLEAR_VARS)
-
-abi_header := shared-glapi/glapi_mapi_tmp.h
-
-LOCAL_SRC_FILES := \
- entry.c \
- mapi_glapi.c \
- stub.c \
- table.c \
- u_current.c \
- u_execmem.c
-
-LOCAL_CFLAGS := \
- -DMAPI_MODE_GLAPI \
- -DMAPI_ABI_HEADER=\"$(abi_header)\"
-
-LOCAL_C_INCLUDES := \
- $(MESA_TOP)/src/mapi
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
- $(MESA_TOP)/src/mapi
-
-LOCAL_MODULE := libglapi
-
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-intermediates := $(call local-generated-sources-dir)
-abi_header := $(intermediates)/$(abi_header)
-LOCAL_GENERATED_SOURCES := $(abi_header)
-
-$(abi_header): PRIVATE_PRINTER := shared-glapi
-
-mapi_abi_headers += $(abi_header)
-
-include $(MESA_COMMON_MK)
-include $(BUILD_SHARED_LIBRARY)
-
-
-mapi_abi_deps := \
- $(wildcard $(LOCAL_PATH)/glapi/gen/*.py) \
- $(wildcard $(LOCAL_PATH)/glapi/gen/*.xml) \
- $(LOCAL_PATH)/mapi_abi.py
-
-$(mapi_abi_headers): PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/mapi_abi.py
-$(mapi_abi_headers): PRIVATE_APIXML := $(LOCAL_PATH)/glapi/gen/gl_and_es_API.xml
-$(mapi_abi_headers): $(mapi_abi_deps)
- @mkdir -p $(dir $@)
- @echo "target $(PRIVATE_PRINTER): $(PRIVATE_MODULE) <= $(PRIVATE_APIXML)"
- $(hide) $(PRIVATE_SCRIPT) --printer $(PRIVATE_PRINTER) $(PRIVATE_APIXML) > $@
diff --git a/src/mapi/Makefile.sources b/src/mapi/Makefile.sources
deleted file mode 100644
index 4b83caa8ed2..00000000000
--- a/src/mapi/Makefile.sources
+++ /dev/null
@@ -1,38 +0,0 @@
-# src/mapi/Makefile.sources
-#
-# mapi may be used in several ways
-#
-# - In util mode, mapi provides utility functions for use with glapi. To use
-# this mode, compile MAPI_UTIL_FILES with MAPI_MODE_UTIL defined.
-#
-# - In glapi mode, mapi implements the interface defined by glapi.h. To use
-# this mode, compile MAPI_GLAPI_FILES with MAPI_MODE_GLAPI defined.
-#
-# - In bridge mode, mapi provides entry points calling into glapi. To use
-# this mode, compile MAPI_BRIDGE_FILES with MAPI_MODE_BRIDGE defined.
-
-MAPI_UTIL_FILES = \
- u_current.c \
- u_current.h \
- u_execmem.c \
- u_execmem.h
-
-MAPI_BRIDGE_FILES = \
- entry.c \
- entry.h \
- entry_x86-64_tls.h \
- entry_x86_tls.h \
- entry_x86_tsd.h \
- entry_ppc64le_tls.h \
- entry_ppc64le_tsd.h \
- mapi_tmp.h
-
-MAPI_GLAPI_FILES = \
- entry.c \
- mapi_glapi.c \
- stub.c \
- stub.h \
- table.c \
- table.h \
- $(MAPI_UTIL_FILES)
-