Attempting to fix Android build error

foxhatleo · Mar 12, 2021 · a724607 · a724607
1 parent 348202b
commit a724607
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 3 deletions.
diff --git a/build-android/.idea/.gitignore b/build-android/.idea/.gitignore
diff --git a/build-android/.idea/.name b/build-android/.idea/.name
diff --git a/build-android/.idea/compiler.xml b/build-android/.idea/compiler.xml
diff --git a/build-android/.idea/gradle.xml b/build-android/.idea/gradle.xml
diff --git a/build-android/.idea/jarRepositories.xml b/build-android/.idea/jarRepositories.xml
diff --git a/build-android/.idea/misc.xml b/build-android/.idea/misc.xml
diff --git a/build-android/.idea/vcs.xml b/build-android/.idea/vcs.xml
diff --git a/build-android/app/jni/source/Android.mk b/build-android/app/jni/source/Android.mk
@@ -10,10 +10,16 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := main
 LOCAL_C_INCLUDES := $(CUGL_PATH)/include
+LOCAL_C_INCLUDES += $(PROJ_PATH)/source
 
-# Add your application source files here...
-LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,, \
-	$(wildcard $(PROJ_PATH)/source/*.cpp))
+define walk
+  $(wildcard $(1)) $(foreach e, $(wildcard $(1)/*), $(call walk, $(e)))
+endef
+
+ALL_FILES_IN_SOURCE = $(call walk, $(PROJ_PATH)/source)
+CPP_SOURCE_FILES := $(filter %.cpp, $(ALL_FILES_IN_SOURCE))
+
+LOCAL_SRC_FILES := $(CPP_SOURCE_FILES:$(LOCAL_PATH)/%=%)
 
 # Line the libraries
 LOCAL_SHARED_LIBRARIES := hidapi