From 26a01a67971cc773ae2396d58e4606d40d998950 Mon Sep 17 00:00:00 2001 From: Roman Stratiienko Date: Tue, 6 Aug 2019 10:14:50 +0300 Subject: [PATCH] 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 Reviewed-by: Icenowy Zheng Reviewed-by: Vasily Khoruzhick Acked-by: Qiang Yu --- Android.mk | 3 ++- src/panfrost/Android.shared.mk | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) 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) -- 2.30.2