[Mesa-dev] [PATCH 2/2] mapi: share sources.mak with Android again

[nobled]

This (sort of) reverts commit 5154b45217695e5daf24110bcff043fa1959d0a5
    "mapi: Fix Android build"
---
 src/mapi/Android.mk |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/mapi/Android.mk b/src/mapi/Android.mk
index d1749a2..9d54210 100644
--- a/src/mapi/Android.mk
+++ b/src/mapi/Android.mk
@@ -25,6 +25,10 @@

 LOCAL_PATH := $(call my-dir)

+# LOCAL_SRC_FILES must only contain relative paths.
+MAPI := ./mapi
+include $(LOCAL_PATH)/mapi/sources.mak
+
 mapi_abi_headers :=

 # ---------------------------------------
@@ -35,13 +39,7 @@ include $(CLEAR_VARS)

 abi_header := shared-glapi/glapi_mapi_tmp.h

-LOCAL_SRC_FILES := \
-	mapi/entry.c \
-	mapi/mapi_glapi.c \
-	mapi/stub.c \
-	mapi/table.c \
-	mapi/u_current.c \
-	mapi/u_execmem.c
+LOCAL_SRC_FILES := $(MAPI_GLAPI_FILES)

 LOCAL_CFLAGS := \
 	-DMAPI_MODE_GLAPI \
-- 
1.7.9.5