X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmapi%2FAndroid.mk;h=9405d2ac3d5d9f4ad2f32cb04aa8690941550886;hb=d00f36ac25b25402c4d81a0229a703a1b84fc40c;hp=d1749a2625d661cd6b91e1a1b1d51d350b78497a;hpb=5154b45217695e5daf24110bcff043fa1959d0a5;p=mesa.git

diff --git a/src/mapi/Android.mk b/src/mapi/Android.mk
index d1749a2625d..9405d2ac3d5 100644
--- a/src/mapi/Android.mk
+++ b/src/mapi/Android.mk
@@ -36,12 +36,12 @@ 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
+	entry.c \
+	mapi_glapi.c \
+	stub.c \
+	table.c \
+	u_current.c \
+	u_execmem.c
 
 LOCAL_CFLAGS := \
 	-DMAPI_MODE_GLAPI \
@@ -50,10 +50,13 @@ LOCAL_CFLAGS := \
 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)
+intermediates := $(call local-generated-sources-dir)
 abi_header := $(intermediates)/$(abi_header)
 LOCAL_GENERATED_SOURCES := $(abi_header)
 
@@ -68,11 +71,11 @@ 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_headers): PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/mapi/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) --mode lib $(PRIVATE_APIXML) > $@
+	$(hide) $(PRIVATE_SCRIPT) --printer $(PRIVATE_PRINTER) $(PRIVATE_APIXML) > $@