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 8d274e5683689d50e51ae277b9dd24315c6cdea3..76d26f9bd83043dfad624fd4887dac118fefaf59 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -115,7 +115,8 @@ SUBDIRS := \
        src/broadcom \
        src/intel \
        src/mesa/drivers/dri \
        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)
 
 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 e1dd3babfe6682c0863b6b82ebc7054369978faa..6b921756ecb874386300d20962b636d65db8ac60 100644 (file)
--- a/src/panfrost/Android.shared.mk
+++ b/src/panfrost/Android.shared.mk
@@ -29,9 +29,11 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \

-       $(shared_SOURCES)
+       $(shared_FILES)

 
 LOCAL_C_INCLUDES := \
 
 LOCAL_C_INCLUDES := \

+       $(MESA_TOP)/src/gallium/auxiliary/ \
+       $(MESA_TOP)/src/gallium/include/ \

 
 LOCAL_STATIC_LIBRARIES := \
 
 
 LOCAL_STATIC_LIBRARIES := \
 


@@ -39,5 +41,8 @@ LOCAL_MODULE := libpanfrost_shared
 
 LOCAL_GENERATED_SOURCES := \
 
 
 LOCAL_GENERATED_SOURCES := \
 

+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+       $(MESA_TOP)/src/panfrost/shared/ \
+

 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)