From d7935b4fa8d51de6b1a172a24a121ba3ca4d82a2 Mon Sep 17 00:00:00 2001 From: Mathieu Kardous Date: Fri, 13 Oct 2023 14:40:28 -0400 Subject: [PATCH] remove sl_openthread_root --- third_party/silabs/BUILD.gn | 90 ++++++++++++++++---------------- third_party/silabs/efr32_sdk.gni | 1 - 2 files changed, 44 insertions(+), 47 deletions(-) diff --git a/third_party/silabs/BUILD.gn b/third_party/silabs/BUILD.gn index f6852dbf345c94..8fc957a24cd2f7 100644 --- a/third_party/silabs/BUILD.gn +++ b/third_party/silabs/BUILD.gn @@ -56,14 +56,13 @@ if (wifi_soc != true) { # CCP board # Openthread GSDK libraries configurations if (use_silabs_thread_lib) { config("libopenthread-platform_config") { - include_dirs = [ "${sl_openthread_root}/examples/platforms" ] + include_dirs = [ "${openthread_root}/examples/platforms" ] defines = [ "SL_CONFIG_OPENTHREAD_LIB=1" ] } copy("copy_openthread_system") { - sources = - [ "${sl_openthread_root}/examples/platforms/openthread-system.h" ] + sources = [ "${openthread_root}/examples/platforms/openthread-system.h" ] outputs = [ "${root_gen_dir}/include/openthread/platform/{{source_file_part}}" ] @@ -76,8 +75,7 @@ if (wifi_soc != true) { # CCP board } source_set("libopenthread-platform") { - sources = - [ "${sl_openthread_root}/examples/platforms/openthread-system.h" ] + sources = [ "${openthread_root}/examples/platforms/openthread-system.h" ] public_deps = [ ":openthread_system" ] @@ -97,7 +95,7 @@ if (wifi_soc != true) { # CCP board "${chip_root}/examples/platform/silabs", "${sdk_support_root}/matter/efr32/${silabs_family}/${silabs_board}", "${sl_ot_efr32_root}", - "${sl_openthread_root}/src/", + "${openthread_root}/src/", ] # temporarily disable check until gsdk pulls in a more recent version @@ -121,43 +119,43 @@ if (wifi_soc != true) { # CCP board source_set("ot-efr32-cert") { if (enable_openthread_cli) { sources = [ - "${sl_openthread_root}/examples/apps/cli/cli_uart.cpp", - "${sl_openthread_root}/src/cli/cli.cpp", - "${sl_openthread_root}/src/cli/cli.hpp", - "${sl_openthread_root}/src/cli/cli_bbr.cpp", - "${sl_openthread_root}/src/cli/cli_bbr.hpp", - "${sl_openthread_root}/src/cli/cli_br.cpp", - "${sl_openthread_root}/src/cli/cli_br.hpp", - "${sl_openthread_root}/src/cli/cli_coap.cpp", - "${sl_openthread_root}/src/cli/cli_coap.hpp", - "${sl_openthread_root}/src/cli/cli_coap_secure.cpp", - "${sl_openthread_root}/src/cli/cli_coap_secure.hpp", - "${sl_openthread_root}/src/cli/cli_commissioner.cpp", - "${sl_openthread_root}/src/cli/cli_commissioner.hpp", - "${sl_openthread_root}/src/cli/cli_config.h", - "${sl_openthread_root}/src/cli/cli_dataset.cpp", - "${sl_openthread_root}/src/cli/cli_dataset.hpp", - "${sl_openthread_root}/src/cli/cli_dns.cpp", - "${sl_openthread_root}/src/cli/cli_dns.hpp", - "${sl_openthread_root}/src/cli/cli_history.cpp", - "${sl_openthread_root}/src/cli/cli_history.hpp", - "${sl_openthread_root}/src/cli/cli_joiner.cpp", - "${sl_openthread_root}/src/cli/cli_joiner.hpp", - "${sl_openthread_root}/src/cli/cli_mac_filter.cpp", - "${sl_openthread_root}/src/cli/cli_mac_filter.hpp", - "${sl_openthread_root}/src/cli/cli_network_data.cpp", - "${sl_openthread_root}/src/cli/cli_network_data.hpp", - "${sl_openthread_root}/src/cli/cli_output.cpp", - "${sl_openthread_root}/src/cli/cli_output.hpp", - "${sl_openthread_root}/src/cli/cli_srp_client.cpp", - "${sl_openthread_root}/src/cli/cli_srp_client.hpp", - "${sl_openthread_root}/src/cli/cli_srp_server.cpp", - "${sl_openthread_root}/src/cli/cli_srp_server.hpp", - "${sl_openthread_root}/src/cli/cli_tcp.cpp", - "${sl_openthread_root}/src/cli/cli_tcp.hpp", - "${sl_openthread_root}/src/cli/cli_udp.cpp", - "${sl_openthread_root}/src/cli/cli_udp.hpp", - "${sl_openthread_root}/src/cli/x509_cert_key.hpp", + "${openthread_root}/examples/apps/cli/cli_uart.cpp", + "${openthread_root}/src/cli/cli.cpp", + "${openthread_root}/src/cli/cli.hpp", + "${openthread_root}/src/cli/cli_bbr.cpp", + "${openthread_root}/src/cli/cli_bbr.hpp", + "${openthread_root}/src/cli/cli_br.cpp", + "${openthread_root}/src/cli/cli_br.hpp", + "${openthread_root}/src/cli/cli_coap.cpp", + "${openthread_root}/src/cli/cli_coap.hpp", + "${openthread_root}/src/cli/cli_coap_secure.cpp", + "${openthread_root}/src/cli/cli_coap_secure.hpp", + "${openthread_root}/src/cli/cli_commissioner.cpp", + "${openthread_root}/src/cli/cli_commissioner.hpp", + "${openthread_root}/src/cli/cli_config.h", + "${openthread_root}/src/cli/cli_dataset.cpp", + "${openthread_root}/src/cli/cli_dataset.hpp", + "${openthread_root}/src/cli/cli_dns.cpp", + "${openthread_root}/src/cli/cli_dns.hpp", + "${openthread_root}/src/cli/cli_history.cpp", + "${openthread_root}/src/cli/cli_history.hpp", + "${openthread_root}/src/cli/cli_joiner.cpp", + "${openthread_root}/src/cli/cli_joiner.hpp", + "${openthread_root}/src/cli/cli_mac_filter.cpp", + "${openthread_root}/src/cli/cli_mac_filter.hpp", + "${openthread_root}/src/cli/cli_network_data.cpp", + "${openthread_root}/src/cli/cli_network_data.hpp", + "${openthread_root}/src/cli/cli_output.cpp", + "${openthread_root}/src/cli/cli_output.hpp", + "${openthread_root}/src/cli/cli_srp_client.cpp", + "${openthread_root}/src/cli/cli_srp_client.hpp", + "${openthread_root}/src/cli/cli_srp_server.cpp", + "${openthread_root}/src/cli/cli_srp_server.hpp", + "${openthread_root}/src/cli/cli_tcp.cpp", + "${openthread_root}/src/cli/cli_tcp.hpp", + "${openthread_root}/src/cli/cli_udp.cpp", + "${openthread_root}/src/cli/cli_udp.hpp", + "${openthread_root}/src/cli/x509_cert_key.hpp", ] } @@ -169,9 +167,9 @@ if (wifi_soc != true) { # CCP board public_deps = [ ":libopenthread-platform", ":openthread_core_config_efr32", + "${openthread_root}/include/openthread:openthread", + "${openthread_root}/src/core/:libopenthread_core_headers", "${segger_rtt_root}:segger_rtt", - "${sl_openthread_root}/include/openthread:openthread", - "${sl_openthread_root}/src/core/:libopenthread_core_headers", ] deps = [ "${efr32_sdk_build_root}:efr32_sdk" ] @@ -188,7 +186,7 @@ if (wifi_soc != true) { # CCP board COAP_API = "coap_" } - public_configs += [ "${sl_openthread_root}:openthread_${XTD}_config" ] + public_configs += [ "${openthread_root}:openthread_${XTD}_config" ] libs = [ "${sl_ot_libs_path}/libs/libsl_ot_stack_${XTD}_${COAP_API}${silabs_family}_gcc.a", diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni index e04aa9d7070e75..66177a7bea5936 100644 --- a/third_party/silabs/efr32_sdk.gni +++ b/third_party/silabs/efr32_sdk.gni @@ -79,7 +79,6 @@ declare_args() { sl_ot_libs_path = "${efr32_sdk_root}/protocol/openthread" sl_ot_platform_abstraction = "${efr32_sdk_root}/protocol/openthread/platform-abstraction" - sl_openthread_root = "${efr32_sdk_root}/util/third_party/openthread" # board related pre-generated files path (default) sl_pre_gen_path =