address PR22049 post-merge commments (project-chip#22085)

isiu-apple · Sep 16, 2022 · 096185c · 096185c
1 parent 6bab808
commit 096185c
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 13 deletions.
diff --git a/examples/chef/efr32/BUILD.gn b/examples/chef/efr32/BUILD.gn
@@ -207,7 +207,7 @@ efr32_executable("chef_app") {
   if (chip_enable_openthread) {
     deps += [
       "${chip_root}/third_party/openthread:openthread",
-      "${chip_root}/third_party/openthread:openthread_device",
+      "${chip_root}/third_party/openthread:openthread-platform",
       "${examples_plat_dir}:efr-matter-shell",
     ]
   }

diff --git a/examples/light-switch-app/efr32/BUILD.gn b/examples/light-switch-app/efr32/BUILD.gn
@@ -200,7 +200,7 @@ efr32_executable("light_switch_app") {
   if (chip_enable_openthread) {
     deps += [
       "${chip_root}/third_party/openthread:openthread",
-      "${chip_root}/third_party/openthread:openthread_device",
+      "${chip_root}/third_party/openthread:openthread-platform",
       "${examples_plat_dir}:efr-matter-shell",
     ]
   }

diff --git a/examples/lighting-app/efr32/BUILD.gn b/examples/lighting-app/efr32/BUILD.gn
@@ -205,7 +205,7 @@ efr32_executable("lighting_app") {
   if (chip_enable_openthread) {
     deps += [
       "${chip_root}/third_party/openthread:openthread",
-      "${chip_root}/third_party/openthread:openthread_device",
+      "${chip_root}/third_party/openthread:openthread-platform",
       "${examples_plat_dir}:efr-matter-shell",
     ]
   }

diff --git a/examples/lock-app/efr32/BUILD.gn b/examples/lock-app/efr32/BUILD.gn
@@ -202,7 +202,7 @@ efr32_executable("lock_app") {
   if (chip_enable_openthread) {
     deps += [
       "${chip_root}/third_party/openthread:openthread",
-      "${chip_root}/third_party/openthread:openthread_device",
+      "${chip_root}/third_party/openthread:openthread-platform",
       "${examples_plat_dir}:efr-matter-shell",
     ]
   }

diff --git a/examples/shell/shell_common/BUILD.gn b/examples/shell/shell_common/BUILD.gn
@@ -53,8 +53,8 @@ static_library("shell_common") {
   if (chip_enable_openthread &&
       (current_os == "freertos" || current_os == "zephyr")) {
     public_deps += [
+      "${chip_root}/third_party/openthread:openthread",
       "${chip_root}/third_party/openthread:openthread_cli",
-      "${chip_root}/third_party/openthread:openthread_device",
     ]
   }
 

diff --git a/examples/thermostat/efr32/BUILD.gn b/examples/thermostat/efr32/BUILD.gn
@@ -196,7 +196,7 @@ efr32_executable("thermostat_app") {
   if (chip_enable_openthread) {
     deps += [
       "${chip_root}/third_party/openthread:openthread",
-      "${chip_root}/third_party/openthread:openthread_device",
+      "${chip_root}/third_party/openthread:openthread-platform",
       "${examples_plat_dir}:efr-matter-shell",
     ]
   }

diff --git a/examples/window-app/efr32/BUILD.gn b/examples/window-app/efr32/BUILD.gn
@@ -188,7 +188,7 @@ efr32_executable("window_app") {
   if (chip_enable_openthread) {
     deps += [
       "${chip_root}/third_party/openthread:openthread",
-      "${chip_root}/third_party/openthread:openthread_device",
+      "${chip_root}/third_party/openthread:openthread-platform",
       "${examples_plat_dir}:efr-matter-shell",
     ]
   }

diff --git a/src/inet/BUILD.gn b/src/inet/BUILD.gn
@@ -107,7 +107,7 @@ static_library("inet") {
   }
 
   if (chip_system_config_use_open_thread_inet_endpoints) {
-    public_deps += [ "${chip_root}/third_party/openthread:openthread_device" ]
+    public_deps += [ "${chip_root}/third_party/openthread:openthread" ]
   }
 
   if (chip_inet_config_enable_tcp_endpoint) {

diff --git a/src/platform/EFR32/BUILD.gn b/src/platform/EFR32/BUILD.gn
@@ -98,7 +98,7 @@ static_library("EFR32") {
     "$dir_pw_kvs",
   ]
   if (chip_enable_openthread) {
-    public_deps += [ "${chip_root}/third_party/openthread:openthread_device" ]
+    public_deps += [ "${chip_root}/third_party/openthread:openthread" ]
 
     deps += [ "${chip_root}/third_party/openthread:openthread_cli" ]
 

diff --git a/src/test_driver/efr32/BUILD.gn b/src/test_driver/efr32/BUILD.gn
@@ -96,7 +96,7 @@ efr32_executable("efr32_device_tests") {
   if (chip_enable_openthread) {
     deps += [
       "${chip_root}/third_party/openthread:openthread",
-      "${chip_root}/third_party/openthread:openthread_device",
+      "${chip_root}/third_party/openthread:openthread-platform",
       "${examples_plat_dir}:efr-matter-shell",
     ]
   }

diff --git a/third_party/openthread/BUILD.gn b/third_party/openthread/BUILD.gn
@@ -8,7 +8,7 @@ declare_args() {
   chip_openthread_target = ""
 }
 
-group("openthread") {
+group("openthread-platform") {
   if (chip_openthread_target != "") {
     public_deps = [ chip_openthread_target ]
   } else {
@@ -19,7 +19,7 @@ group("openthread") {
   }
 }
 
-group("openthread_device") {
+group("openthread") {
   if (chip_openthread_target != "") {
     public_deps = [ chip_openthread_target ]
   } else {

diff --git a/third_party/silabs/BUILD.gn b/third_party/silabs/BUILD.gn
@@ -131,7 +131,7 @@ if (use_silabs_thread_lib) {
       ":libopenthread-platform",
       ":openthread_core_config_efr32",
       "${segger_rtt_root}:segger_rtt",
-      "${sl_openthread_root}/include/openthread:openthread",
+      "${sl_openthread_root}/include/openthread:openthread-platform",
       "${sl_openthread_root}/src/core/:libopenthread_core_headers",
     ]