Added few more stubs so that control reaches to DestroyDevice().

[mesa.git] / src / mapi / Android.mk

diff --git a/src/mapi/Android.mk b/src/mapi/Android.mk
index 0d09ee13f99f5564f6a53c47dd552f7b304add5a..9405d2ac3d5d9f4ad2f32cb04aa8690941550886 100644 (file)
--- a/src/mapi/Android.mk
+++ b/src/mapi/Android.mk
@@ -25,36 +25,57 @@
 
 LOCAL_PATH := $(call my-dir)
 
+mapi_abi_headers :=
+
+# ---------------------------------------
+# Build libglapi
+# ---------------------------------------
+
 include $(CLEAR_VARS)
 
-include $(LOCAL_PATH)/mapi/sources.mak
-LOCAL_SRC_FILES := $(addprefix mapi/, $(MAPI_GLAPI_SOURCES))
+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=\"shared-glapi/glapi_mapi_tmp.h\"
+       -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-intermediates-dir)
-mapi_abi_header := $(intermediates)/shared-glapi/glapi_mapi_tmp.h
-LOCAL_GENERATED_SOURCES := $(mapi_abi_header)
+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/mapi_abi.py
+       $(LOCAL_PATH)/mapi_abi.py
 
-$(mapi_abi_header): PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/mapi/mapi_abi.py
-$(mapi_abi_header): PRIVATE_APIXML := $(LOCAL_PATH)/glapi/gen/gl_and_es_API.xml
-$(mapi_abi_header): $(mapi_abi_deps)
+$(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 "Gen GLAPI: $(PRIVATE_MODULE) <= $(notdir $@)"
-       $(hide) $(PRIVATE_SCRIPT) --printer shared-glapi --mode lib $(PRIVATE_APIXML) > $@
-
-include $(MESA_COMMON_MK)
-include $(BUILD_SHARED_LIBRARY)
+       @echo "target $(PRIVATE_PRINTER): $(PRIVATE_MODULE) <= $(PRIVATE_APIXML)"
+       $(hide) $(PRIVATE_SCRIPT) --printer $(PRIVATE_PRINTER) $(PRIVATE_APIXML) > $@