aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-05-07 23:07:15 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-05-07 23:07:15 +0000
commitb4a6bf11a02f3918dd492e594cf02c503d23e671 (patch)
tree63fb4d883a83f6e6ac4d6dd1ceaf3f33d7b7be9a
parenta377e31dda682a1a0f7c4b116c59f27021cada90 (diff)
parent3275cfc8e4374ed213b84f65a9c91242b6432eb9 (diff)
downloadot-br-posix-sdk-release.tar.gz
Snap for 11812660 from 3275cfc8e4374ed213b84f65a9c91242b6432eb9 to sdk-releasesdk-releasebusytown-mac-infra-release
Change-Id: I827bd89ad332bbea335c598b49b70209a6b0fceb
-rw-r--r--Android.bp1
-rw-r--r--src/backbone_router/backbone_agent.cpp2
-rw-r--r--src/backbone_router/backbone_agent.hpp4
3 files changed, 7 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index f6ba8a5a..fbd9ebd3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -135,6 +135,7 @@ cc_defaults {
"-DOTBR_CONFIG_FILE=\"src/android/otbr-config-android.h\"",
"-DOTBR_ENABLE_VENDOR_SERVER=1", // for OtDaemonServer
"-DOTBR_ENABLE_BACKBONE_ROUTER=1",
+ "-DOTBR_ENABLE_BACKBONE_ROUTER_ON_INIT=0",
"-DOTBR_ENABLE_BORDER_ROUTING=1",
"-DOTBR_ENABLE_BORDER_ROUTING_COUNTERS=1",
"-DOTBR_ENABLE_BORDER_AGENT=1",
diff --git a/src/backbone_router/backbone_agent.cpp b/src/backbone_router/backbone_agent.cpp
index 104a4e56..fc79b8f5 100644
--- a/src/backbone_router/backbone_agent.cpp
+++ b/src/backbone_router/backbone_agent.cpp
@@ -71,7 +71,9 @@ void BackboneAgent::Init(void)
mNdProxyManager.Init();
#endif
+#if OTBR_ENABLE_BACKBONE_ROUTER_ON_INIT
otBackboneRouterSetEnabled(mNcp.GetInstance(), /* aEnabled */ true);
+#endif
}
void BackboneAgent::HandleThreadStateChanged(otChangedFlags aFlags)
diff --git a/src/backbone_router/backbone_agent.hpp b/src/backbone_router/backbone_agent.hpp
index 0ff78083..c7566bcc 100644
--- a/src/backbone_router/backbone_agent.hpp
+++ b/src/backbone_router/backbone_agent.hpp
@@ -36,6 +36,10 @@
#include "openthread-br/config.h"
+#ifndef OTBR_ENABLE_BACKBONE_ROUTER_ON_INIT
+#define OTBR_ENABLE_BACKBONE_ROUTER_ON_INIT OTBR_ENABLE_BACKBONE_ROUTER
+#endif
+
#if OTBR_ENABLE_BACKBONE_ROUTER
#include <openthread/backbone_router_ftd.h>