Conditionally compile mesh files.

Author: h2zero

src/nimble/nimble/host/mesh/src/access.c

@@ -7,6 +7,8 @@
  */
 
 #include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_ACCESS_LOG
 
 #include <errno.h>
@@ -1311,3 +1313,5 @@ void bt_mesh_access_init(void)
 				 "Failed to register bt_mesh_access conf");
     #endif
 }
+
+#endif /* MYNEWT_VAL(BLE_MESH) */

src/nimble/nimble/host/mesh/src/adv.c

@@ -8,6 +8,8 @@
  */
 
 #include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_ADV_LOG
 
 #include "nimble/nimble/host/mesh/include/mesh/mesh.h"
@@ -255,3 +257,5 @@ int bt_mesh_scan_disable(void)
 
 	return 0;
 }
+
+#endif /* MYNEWT_VAL(BLE_MESH) */

src/nimble/nimble/host/mesh/src/adv_legacy.c

@@ -7,6 +7,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_ADV_LOG
 
 #include "adv.h"
@@ -250,3 +253,5 @@ int bt_mesh_adv_start(const struct ble_gap_adv_params *param, int32_t duration,
 	return bt_le_adv_start(param, ad, ad_len, sd, sd_len);
 }
 #endif
+
+#endif /* MYNEWT_VAL(BLE_MESH) */

src/nimble/nimble/host/mesh/src/aes-ccm.c

@@ -5,6 +5,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #include "crypto.h"
 #define MESH_LOG_MODULE BLE_MESH_LOG
 
@@ -222,3 +225,5 @@ int bt_ccm_encrypt(const uint8_t key[16], uint8_t nonce[13], const uint8_t *msg,
 
 	return 0;
 }
+
+#endif /* MYNEWT_VAL(BLE_MESH) */

src/nimble/nimble/host/mesh/src/app_keys.c

@@ -5,6 +5,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #include <string.h>
 #include <stdlib.h>
 #include "nimble/nimble/host/mesh/include/mesh/mesh.h"
@@ -715,3 +718,5 @@ void bt_mesh_app_key_init(void)
 				 "Failed to register bt_mesh_app_key conf");
 #endif
 }
+
+#endif /* MYNEWT_VAL(BLE_MESH) */

src/nimble/nimble/host/mesh/src/beacon.c

@@ -7,6 +7,8 @@
  */
 
 #include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_BEACON_LOG
 
 #include <errno.h>
@@ -470,3 +472,5 @@ void bt_mesh_beacon_disable(void)
 		(void)k_work_cancel_delayable(&beacon_timer);
 	}
 }
+
+#endif /* MYNEWT_VAL(BLE_MESH) */

src/nimble/nimble/host/mesh/src/cdb.c

@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_LOG
 #include "nimble/porting/nimble/include/log/log.h"
 #include <stdlib.h>
@@ -1140,3 +1143,5 @@ void bt_mesh_cdb_init(void)
 #endif
 }
 #endif
+
+#endif /* MYNEWT_VAL(BLE_MESH) */

src/nimble/nimble/host/mesh/src/cfg.c

@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #include "nimble/nimble/host/mesh/include/mesh/mesh.h"
 #include "mesh_priv.h"
 #include "net.h"
@@ -386,3 +389,5 @@ void bt_mesh_cfg_default_set(void)
 		atomic_set_bit(bt_mesh.flags, BT_MESH_FRIEND);
 	}
 }
+
+#endif /* MYNEWT_VAL(BLE_MESH) */

src/nimble/nimble/host/mesh/src/cfg_srv.c

@@ -7,6 +7,8 @@
  */
 
 #include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_MODEL_LOG
 
 #include <string.h>
@@ -2643,3 +2645,5 @@ void bt_mesh_model_reset(void)
 {
 	bt_mesh_model_foreach(mod_reset, NULL);
 }
+
+#endif /* MYNEWT_VAL(BLE_MESH) */

src/nimble/nimble/host/mesh/src/crypto.c

@@ -7,6 +7,8 @@
  */
 
 #include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_CRYPTO_LOG
 
 #include <string.h>
@@ -603,3 +605,5 @@ int bt_mesh_beacon_auth(const uint8_t beacon_key[16], uint8_t flags,
 
 	return err;
 }
+
+#endif /* MYNEWT_VAL(BLE_MESH) */