From: Roman Stratiienko <roman.stratiienko@globallogic.com>
Date: Tue, 6 Aug 2019 07:14:50 +0000 (+0300)
Subject: Add libpanfrost_shared to Android build
X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=26a01a67971cc773ae2396d58e4606d40d998950

Add libpanfrost_shared to Android build

1. Add missing directory to ./Android.mk
2. Fix ./src/panfrost/Android.shared.mk

Signed-off-by: Roman Stratiienko <roman.stratiienko@globallogic.com>
Reviewed-by: Icenowy Zheng <icenowy@aosc.io>
Reviewed-by: Vasily Khoruzhick <anarsoul@gmail.com>
Acked-by: Qiang Yu <yuq825@gmail.com>
---

diff --git a/Android.mk b/Android.mk
index 8d274e56836..76d26f9bd83 100644
--- a/Android.mk
+++ b/Android.mk
@@ -115,7 +115,8 @@ SUBDIRS := \
 	src/broadcom \
 	src/intel \
 	src/mesa/drivers/dri \
-	src/vulkan
+	src/vulkan \
+	src/panfrost \
 
 INC_DIRS := $(call all-named-subdir-makefiles,$(SUBDIRS))
 INC_DIRS += $(call all-named-subdir-makefiles,src/gallium)
diff --git a/src/panfrost/Android.shared.mk b/src/panfrost/Android.shared.mk
index e1dd3babfe6..6b921756ecb 100644
--- a/src/panfrost/Android.shared.mk
+++ b/src/panfrost/Android.shared.mk
@@ -29,9 +29,11 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
-	$(shared_SOURCES)
+	$(shared_FILES)
 
 LOCAL_C_INCLUDES := \
+	$(MESA_TOP)/src/gallium/auxiliary/ \
+	$(MESA_TOP)/src/gallium/include/ \
 
 LOCAL_STATIC_LIBRARIES := \
 
@@ -39,5 +41,8 @@ LOCAL_MODULE := libpanfrost_shared
 
 LOCAL_GENERATED_SOURCES := \
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+	$(MESA_TOP)/src/panfrost/shared/ \
+
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)