Revert "[nxp fromtree] [NXP] Add multiple ble connections support (project-chip#35645)"

This reverts commit aec7b2f.

Signed-off-by: Gatien Chapon <gatien.chapon@nxp.com>

Author: chapongatien

examples/contact-sensor-app/nxp/k32w1/BUILD.gn

@@ -139,11 +139,9 @@ mcxw71_k32w1_executable("contact_sensor_app") {
     "${common_example_dir}/low_power/include",
     "${common_example_dir}/operational_keystore/include",
     "${common_example_dir}/ui_feedback/include",
-    "${common_example_dir}/app_ble/include",
   ]
 
   sources += [
-    "${common_example_dir}/app_ble/source/BLEApplicationManagerEmpty.cpp",
     "${common_example_dir}/app_task/source/AppTaskBase.cpp",
     "${common_example_dir}/app_task/source/AppTaskFreeRTOS.cpp",
     "${common_example_dir}/clusters/source/ZclCallbacks.cpp",

examples/contact-sensor-app/nxp/mcxw71/BUILD.gn

@@ -138,11 +138,9 @@ mcxw71_k32w1_executable("contact_sensor_app") {
     "${common_example_dir}/low_power/include",
     "${common_example_dir}/operational_keystore/include",
     "${common_example_dir}/ui_feedback/include",
-    "${common_example_dir}/app_ble/include",
   ]
 
   sources += [
-    "${common_example_dir}/app_ble/source/BLEApplicationManagerEmpty.cpp",
     "${common_example_dir}/app_task/source/AppTaskBase.cpp",
     "${common_example_dir}/app_task/source/AppTaskFreeRTOS.cpp",
     "${common_example_dir}/clusters/source/ZclCallbacks.cpp",

examples/lighting-app/nxp/k32w1/BUILD.gn

@@ -146,11 +146,9 @@ mcxw71_k32w1_executable("light_app") {
     "${common_example_dir}/operational_keystore/include",
     "${common_example_dir}/rpc/include",
     "${common_example_dir}/ui_feedback/include",
-    "${common_example_dir}/app_ble/include",
   ]
 
   sources += [
-    "${common_example_dir}/app_ble/source/BLEApplicationManagerEmpty.cpp",
     "${common_example_dir}/app_task/source/AppTaskBase.cpp",
     "${common_example_dir}/app_task/source/AppTaskFreeRTOS.cpp",
     "${common_example_dir}/clusters/source/ZclCallbacks.cpp",

examples/lighting-app/nxp/mcxw71/BUILD.gn

@@ -146,11 +146,9 @@ mcxw71_k32w1_executable("light_app") {
     "${common_example_dir}/operational_keystore/include",
     "${common_example_dir}/rpc/include",
     "${common_example_dir}/ui_feedback/include",
-    "${common_example_dir}/app_ble/include",
   ]
 
   sources += [
-    "${common_example_dir}/app_ble/source/BLEApplicationManagerEmpty.cpp",
     "${common_example_dir}/app_task/source/AppTaskBase.cpp",
     "${common_example_dir}/app_task/source/AppTaskFreeRTOS.cpp",
     "${common_example_dir}/clusters/source/ZclCallbacks.cpp",

examples/lock-app/nxp/common/main/AppTask.cpp

@@ -19,7 +19,6 @@
  */
 
 #include "AppTask.h"
-#include "BLEApplicationManager.h"
 #include "CHIPDeviceManager.h"
 #include "LockManager.h"
 #include <app-common/zap-generated/attributes/Accessors.h>
@@ -116,9 +115,6 @@ static CHIP_ERROR cliDoorLock(int argc, char * argv[])
 void LockApp::AppTask::PreInitMatterStack()
 {
     ChipLogProgress(DeviceLayer, "Welcome to NXP Lock Demo App");
-
-    /* BLEApplicationManager implemented per platform or left blank */
-    chip::NXP::App::BleAppMgr().Init();
 }
 
 void LockApp::AppTask::PostInitMatterStack()

examples/lock-app/nxp/k32w1/BUILD.gn

@@ -92,14 +92,6 @@ mcxw71_k32w1_sdk("sdk") {
       "${example_platform_dir}/board/peripherals.h",
     ]
   }
-
-  if (nxp_multiple_ble_connections) {
-    include_dirs += [ "${example_platform_dir}/app_ble/include" ]
-    defines += [
-      "EXTRA_GATT_DB_HEADER=\"extra_gatt_db.h\"",
-      "EXTRA_GATT_UUID_HEADER=\"extra_gatt_uuid128.h\"",
-    ]
-  }
 }
 
 mcxw71_k32w1_executable("lock_app") {
@@ -148,7 +140,6 @@ mcxw71_k32w1_executable("lock_app") {
     "${common_example_dir}/low_power/include",
     "${common_example_dir}/operational_keystore/include",
     "${common_example_dir}/ui_feedback/include",
-    "${common_example_dir}/app_ble/include",
   ]
 
   sources += [
@@ -198,15 +189,6 @@ mcxw71_k32w1_executable("lock_app") {
     deps += [ "${chip_root}/src/platform/nxp:nxp_ota" ]
   }
 
-  if (nxp_multiple_ble_connections) {
-    sources +=
-        [ "${example_platform_dir}/app_ble/source/BLEApplicationManager.cpp" ]
-  } else {
-    sources += [
-      "${common_example_dir}/app_ble/source/BLEApplicationManagerEmpty.cpp",
-    ]
-  }
-
   if (chip_with_diag_logs_demo) {
     sources += [
       "${common_example_dir}/diagnostic_logs/source/DiagnosticLogsDemo.cpp",

examples/lock-app/nxp/k32w1/README.md

@@ -12,7 +12,6 @@ For generic information related to door lock application, please see the
         -   [Flashing the host image](#flashing-the-host-image)
     -   [Debugging](#debugging)
     -   [OTA](#ota)
-    -   [Multiple BLE connections](#multiple-ble-connections)
 
 ## Introduction
 
@@ -164,15 +163,3 @@ Run -> Debug Configurations... -> C/C++ Application
 
 Please see
 [k32w1 OTA guide](../../../../docs/guides/nxp/nxp_mcxw71_ota_guide.md).
-
-## Multiple BLE connections
-
-To compile with the Multiple BLE connections support demo example add the gn
-argument `nxp_multiple_ble_connections=true`.
-
-The application will accept multiple BLE connections after commissioning, by
-pressing the BLE advertise button again. Once discovered by a BLE central, a
-custom GATT service will be visible on the device.
-
-The user can change the default behavior by implementing the class defined in
-[BLEApplicationManager.h](../../../platform/nxp/common/app_ble/include/BLEApplicationManager.h)

examples/lock-app/nxp/mcxw71/BUILD.gn

@@ -92,14 +92,6 @@ mcxw71_k32w1_sdk("sdk") {
       "${example_platform_dir}/board/peripherals.h",
     ]
   }
-
-  if (nxp_multiple_ble_connections) {
-    include_dirs += [ "${example_platform_dir}/app_ble/include" ]
-    defines += [
-      "EXTRA_GATT_DB_HEADER=\"extra_gatt_db.h\"",
-      "EXTRA_GATT_UUID_HEADER=\"extra_gatt_uuid128.h\"",
-    ]
-  }
 }
 
 mcxw71_k32w1_executable("lock_app") {
@@ -148,7 +140,6 @@ mcxw71_k32w1_executable("lock_app") {
     "${common_example_dir}/low_power/include",
     "${common_example_dir}/operational_keystore/include",
     "${common_example_dir}/ui_feedback/include",
-    "${common_example_dir}/app_ble/include",
   ]
 
   sources += [
@@ -198,15 +189,6 @@ mcxw71_k32w1_executable("lock_app") {
     deps += [ "${chip_root}/src/platform/nxp:nxp_ota" ]
   }
 
-  if (nxp_multiple_ble_connections) {
-    sources +=
-        [ "${example_platform_dir}/app_ble/source/BLEApplicationManager.cpp" ]
-  } else {
-    sources += [
-      "${common_example_dir}/app_ble/source/BLEApplicationManagerEmpty.cpp",
-    ]
-  }
-
   if (chip_with_diag_logs_demo) {
     sources += [
       "${common_example_dir}/diagnostic_logs/source/DiagnosticLogsDemo.cpp",

examples/lock-app/nxp/mcxw71/README.md

@@ -12,7 +12,6 @@ For generic information related to door lock application, please see the
         -   [Flashing the host image](#flashing-the-host-image)
     -   [Debugging](#debugging)
     -   [OTA](#ota)
-    -   [Multiple BLE connections](#multiple-ble-connections)
 
 ## Introduction
 
@@ -196,15 +195,3 @@ Run -> Debug Configurations... -> C/C++ Application
 
 Please see
 [mcxw71 OTA guide](../../../../docs/guides/nxp/nxp_mcxw71_ota_guide.md).
-
-## Multiple BLE connections
-
-To compile with the Multiple BLE connections support demo example add the gn
-argument `nxp_multiple_ble_connections=true`.
-
-The application will accept multiple BLE connections after commissioning, by
-pressing the BLE advertise button again. Once discovered by a BLE central, a
-custom GATT service will be visible on the device.
-
-The user can change the default behavior by implementing the class defined in
-[BLEApplicationManager.h](../../../platform/nxp/common/app_ble/include/BLEApplicationManager.h)