Merge branch 'feature-2648' into 'master'

Feature 2648

See merge request !28

src/unix/CMakeLists.txt

@@ -15,7 +15,9 @@ add_library(${PROJECT_NAME} STATIC ${CORE_UNIX_SRCS} ${CORE_UNIX_HEADERS}
 
 target_link_libraries(${PROJECT_NAME} dap_core)
 
-if (NOT ANDROID)
+if (ANDROID)
+    target_link_libraries(${PROJECT_NAME} dap_core_android)
+else()
     target_link_libraries(${PROJECT_NAME} pthread)
 endif()
 

src/unix/linux/dap_network_monitor.c

@@ -6,6 +6,9 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 
+#ifdef __ANDROID__
+    #include "pthread_barrier.h"
+#endif
 
 #include "dap_network_monitor.h"
 #include "dap_common.h"