Bluetooth: Mesh: Move under subsys/bluetooth/mesh

We've already got GATT services in subsys/bluetooth/services so
subsys/bluetooth/mesh is a more natural place. Aditionally this aims
to fix the Kconfig dependencies to be able to use mesh together with
BT_CUSTOM (i.e. a custom, potentially non-HCI, host stack).

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

subsys/bluetooth/CMakeLists.txt

@@ -8,6 +8,7 @@ add_subdirectory(common)
 add_subdirectory_ifdef(CONFIG_BT_HCI host)
 add_subdirectory_ifdef(CONFIG_BT_SHELL shell)
 add_subdirectory_ifdef(CONFIG_BT_CONN services)
+add_subdirectory_ifdef(CONFIG_BT_MESH mesh)
 
 if(CONFIG_BT_CTLR)
   if(CONFIG_BT_LL_SW OR CONFIG_BT_LL_SW_SPLIT)

subsys/bluetooth/Kconfig

@@ -145,4 +145,6 @@ source "subsys/bluetooth/shell/Kconfig"
 
 endif # BT_HCI
 
+source "subsys/bluetooth/mesh/Kconfig"
+
 endif # BT

subsys/bluetooth/host/CMakeLists.txt

@@ -55,5 +55,3 @@ if(CONFIG_BT_HCI_HOST)
     endif()
   endif()
 endif()
-
-add_subdirectory_ifdef(CONFIG_BT_MESH mesh)

subsys/bluetooth/host/Kconfig

@@ -135,8 +135,6 @@ config BT_RX_PRIO
 
 if BT_HCI_HOST
 
-source "subsys/bluetooth/host/mesh/Kconfig"
-
 config BT_HOST_CRYPTO
 	# Hidden option that compiles in random number generation and AES
 	# encryption support using TinyCrypt library if this is not provided

subsys/bluetooth/mesh/adv.c

@@ -21,7 +21,7 @@
 #define LOG_MODULE_NAME bt_mesh_adv
 #include "common/log.h"
 
-#include "../hci_core.h"
+#include "host/hci_core.h"
 
 #include "adv.h"
 #include "net.h"

subsys/bluetooth/mesh/cfg_srv.c

@@ -22,7 +22,7 @@
 #define LOG_MODULE_NAME bt_mesh_cfg_srv
 #include "common/log.h"
 
-#include "../testing.h"
+#include "host/testing.h"
 
 #include "mesh.h"
 #include "adv.h"

subsys/bluetooth/mesh/prov.c

@@ -22,8 +22,8 @@
 #define LOG_MODULE_NAME bt_mesh_prov
 #include "common/log.h"
 
-#include "../ecc.h"
+#include "host/ecc.h"
-#include "../testing.h"
+#include "host/testing.h"
 
 #include "crypto.h"
 #include "adv.h"

subsys/bluetooth/mesh/transport.c

@@ -22,7 +22,7 @@
 #define LOG_MODULE_NAME bt_mesh_transport
 #include "common/log.h"
 
-#include "../testing.h"
+#include "host/testing.h"
 
 #include "crypto.h"
 #include "adv.h"