aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanda Wang <handaw@google.com>2023-12-04 10:13:30 +0800
committerHanda Wang <handaw@google.com>2023-12-04 02:15:52 +0000
commit0f34640d0bb248bad8f11ce7ac316edbe96ab495 (patch)
tree31e6e734352899cc63a9a2cd5569929602502522
parentb0ea20342e7a9e8c1638381e9c469e130852051c (diff)
downloadopenthread-0f34640d0bb248bad8f11ce7ac316edbe96ab495.tar.gz
fix the build and prevent killing the process when infra link is removed
Bug: 299553640 Test: Verified on a Cuttlefish. Change-Id: If3d46a3dddf8a6af17fadc59ce147254053b91b3
-rw-r--r--Android.bp5
-rw-r--r--src/android/openthread-android-config.h5
2 files changed, 7 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index 47695073f..331540030 100644
--- a/Android.bp
+++ b/Android.bp
@@ -196,7 +196,6 @@ filegroup {
"src/core/common/heap.cpp",
"src/core/common/heap_data.cpp",
"src/core/common/heap_string.cpp",
- "src/core/common/instance.cpp",
"src/core/common/log.cpp",
"src/core/common/message.cpp",
"src/core/common/notifier.cpp",
@@ -219,6 +218,7 @@ filegroup {
"src/core/crypto/sha256.cpp",
"src/core/crypto/storage.cpp",
"src/core/diags/factory_diags.cpp",
+ "src/core/instance/instance.cpp",
"src/core/mac/channel_mask.cpp",
"src/core/mac/data_poll_handler.cpp",
"src/core/mac/data_poll_sender.cpp",
@@ -453,7 +453,6 @@ filegroup {
name: "openthread_platform_posix_srcs",
srcs: [
"src/posix/platform/alarm.cpp",
- "src/posix/platform/backbone.cpp",
"src/posix/platform/backtrace.cpp",
"src/posix/platform/configuration.cpp",
"src/posix/platform/config_file.cpp",
@@ -740,7 +739,6 @@ cc_library_static {
"src/core/common/binary_search.cpp",
"src/core/common/error.cpp",
"src/core/common/frame_builder.cpp",
- "src/core/common/instance.cpp",
"src/core/common/log.cpp",
"src/core/common/random.cpp",
"src/core/common/string.cpp",
@@ -752,6 +750,7 @@ cc_library_static {
"src/core/crypto/crypto_platform.cpp",
"src/core/crypto/storage.cpp",
"src/core/diags/factory_diags.cpp",
+ "src/core/instance/instance.cpp",
"src/core/mac/link_raw.cpp",
"src/core/mac/mac_frame.cpp",
"src/core/mac/mac_types.cpp",
diff --git a/src/android/openthread-android-config.h b/src/android/openthread-android-config.h
index e61482d3a..a5d4dc2a2 100644
--- a/src/android/openthread-android-config.h
+++ b/src/android/openthread-android-config.h
@@ -81,3 +81,8 @@
*
*/
#define OPENTHREAD_POSIX_CONFIG_THREAD_NETIF_DEFAULT_NAME "thread-wpan"
+
+/**
+ * Avoids killing the ot-daemon process when the infra link disappears.
+ */
+#define OPENTHREAD_POSIX_CONFIG_EXIT_ON_INFRA_NETIF_LOST_ENABLE 0 \ No newline at end of file