[posix] relocate common platform/network/linux to platform/posix

Move common elements to posix folder

9 files changed, 16 insertions, 13 deletions

diff --git a/cmake/treedata/freebsd/subdirs.txt b/cmake/treedata/freebsd/subdirs.txt
index fd8ed5f21e..38cc9559a8 100644
--- a/cmake/treedata/freebsd/subdirs.txt
+++ b/cmake/treedata/freebsd/subdirs.txt
@@ -11,5 +11,6 @@ xbmc/platform/linux/powermanagement platform/linux/powermanagement
 xbmc/platform/linux/storage         platform/linux/storage
 xbmc/platform/posix                 platform/posix
 xbmc/platform/posix/filesystem      platform/posix/filesystem
+xbmc/platform/posix/network         platform/posix/network
 xbmc/platform/posix/utils           platform/posix/utils
 xbmc/windowing/linux                windowing/linux
diff --git a/cmake/treedata/ios/subdirs.txt b/cmake/treedata/ios/subdirs.txt
index a3a03be965..9442f337ce 100644
--- a/cmake/treedata/ios/subdirs.txt
+++ b/cmake/treedata/ios/subdirs.txt
@@ -8,8 +8,8 @@ xbmc/platform/darwin/ios-common       platform/ios-common
 xbmc/platform/darwin/network          platform/darwin/network
 xbmc/platform/darwin/storage          platform/storage
 xbmc/platform/linux                   platform/linux
-xbmc/platform/linux/network           platform/linux/network
 xbmc/platform/posix                   posix
 xbmc/platform/posix/filesystem        platform/posix/filesystem
+xbmc/platform/posix/network           platform/posix/network
 xbmc/platform/posix/utils             platform/posix/utils
 xbmc/windowing/ios                    windowing/ios
diff --git a/cmake/treedata/linux/subdirs.txt b/cmake/treedata/linux/subdirs.txt
index 7619e2e307..3809dd1d7a 100644
--- a/cmake/treedata/linux/subdirs.txt
+++ b/cmake/treedata/linux/subdirs.txt
@@ -10,5 +10,6 @@ xbmc/platform/linux/powermanagement platform/linux/powermanagement
 xbmc/platform/linux/storage         platform/linux/storage
 xbmc/platform/posix                 platform/posix
 xbmc/platform/posix/filesystem      platform/posix/filesystem
+xbmc/platform/posix/network         platform/posix/network
 xbmc/platform/posix/utils           platform/posix/utils
 xbmc/windowing/linux                windowing/linux
diff --git a/cmake/treedata/osx/subdirs.txt b/cmake/treedata/osx/subdirs.txt
index 943c366242..9f5f025c65 100644
--- a/cmake/treedata/osx/subdirs.txt
+++ b/cmake/treedata/osx/subdirs.txt
@@ -7,8 +7,8 @@ xbmc/platform/darwin/osx/peripherals  platform/osx/peripherals
 xbmc/platform/darwin/osx/powermanagement platform/darwin/osx/powermanagement
 xbmc/platform/darwin/storage          platform/storage
 xbmc/platform/linux                   platform/linux
-xbmc/platform/linux/network           platform/linux/network
 xbmc/platform/posix                   posix
 xbmc/platform/posix/filesystem        platform/posix/filesystem
+xbmc/platform/posix/network           platform/posix/network
 xbmc/platform/posix/utils             platform/posix/utils
 xbmc/windowing/osx                    windowing/osx
diff --git a/xbmc/network/Network.h b/xbmc/network/Network.h
index eba8941a32..70bbab6286 100644
--- a/xbmc/network/Network.h
+++ b/xbmc/network/Network.h
@@ -115,7 +115,7 @@ public:
 #if defined(TARGET_ANDROID)
 #include "platform/android/network/NetworkAndroid.h"
 #elif defined(HAS_LINUX_NETWORK)
-#include "platform/linux/network/NetworkLinux.h"
+#include "platform/posix/network/NetworkLinux.h"
 #elif defined(HAS_WIN32_NETWORK)
 #include "platform/win32/network/NetworkWin32.h"
 #elif defined(HAS_WIN10_NETWORK)
diff --git a/xbmc/platform/linux/network/CMakeLists.txt b/xbmc/platform/linux/network/CMakeLists.txt
index 9a99ed1c20..2920c3c0f4 100644
--- a/xbmc/platform/linux/network/CMakeLists.txt
+++ b/xbmc/platform/linux/network/CMakeLists.txt
@@ -1,12 +1,8 @@
-set(SOURCES NetworkLinux.cpp)
-
-set(HEADERS NetworkLinux.h)
-
 if(AVAHI_FOUND)
-  list(APPEND SOURCES ZeroconfAvahi.cpp
-                      ZeroconfBrowserAvahi.cpp)
-  list(APPEND HEADERS ZeroconfAvahi.h
-                      ZeroconfBrowserAvahi.h)
-endif()
+  set(SOURCES ZeroconfAvahi.cpp
+              ZeroconfBrowserAvahi.cpp)
+  set(HEADERS ZeroconfAvahi.h
+              ZeroconfBrowserAvahi.h)
 
-core_add_library(platform_linux_network)
+  core_add_library(platform_linux_network)
+endif()
diff --git a/xbmc/platform/posix/network/CMakeLists.txt b/xbmc/platform/posix/network/CMakeLists.txt
new file mode 100644
index 0000000000..f68b86802d
--- /dev/null
+++ b/xbmc/platform/posix/network/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(SOURCES NetworkLinux.cpp)
+
+set(HEADERS NetworkLinux.h)
+
+core_add_library(platform_posix_network)
diff --git a/xbmc/platform/linux/network/NetworkLinux.cpp b/xbmc/platform/posix/network/NetworkLinux.cpp
index 35abf12616..35abf12616 100644
--- a/xbmc/platform/linux/network/NetworkLinux.cpp
+++ b/xbmc/platform/posix/network/NetworkLinux.cpp
diff --git a/xbmc/platform/linux/network/NetworkLinux.h b/xbmc/platform/posix/network/NetworkLinux.h
index 13d87076ae..13d87076ae 100644
--- a/xbmc/platform/linux/network/NetworkLinux.h
+++ b/xbmc/platform/posix/network/NetworkLinux.h