fix build errors

project-chip · Apr 10, 2021 · aa4c502 · aa4c502
1 parent 33af7ef
commit aa4c502
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/examples/all-clusters-app/all-clusters-common/BUILD.gn b/examples/all-clusters-app/all-clusters-common/BUILD.gn
@@ -17,6 +17,8 @@ import("//build_overrides/chip.gni")
 import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("all-clusters-common") {
+  public_deps = [ "${chip_root}/src/protocols/secure_channel" ]
+
   cluster_sources = [
     "account-login-server",
     "application-launcher-server",

diff --git a/examples/lock-app/lock-common/BUILD.gn b/examples/lock-app/lock-common/BUILD.gn
@@ -17,6 +17,8 @@ import("//build_overrides/chip.gni")
 import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("lock-common") {
+  public_deps = [ "${chip_root}/src/protocols/secure_channel" ]
+
   cluster_sources = [
     "bindings",
     "network-commissioning",

diff --git a/src/messaging/ExchangeDelegate.h b/src/messaging/ExchangeDelegate.h
@@ -80,7 +80,10 @@ class DLL_EXPORT ExchangeDelegate
     virtual ExchangeTransport * AllocTransport(ReliableMessageMgr * rmMgr, SecureSessionMgr * sessionMgr)
     {
         ApplicationExchangeTransport * transport = chip::Platform::New<Messaging::ApplicationExchangeTransport>();
-        transport->Init(rmMgr, sessionMgr);
+        if (transport != nullptr)
+        {
+            transport->Init(rmMgr, sessionMgr);
+        }
         return transport;
     }