TSBM-21 Restore some of possibly unneeded changes.

meulemanelectronics · Feb 22, 2024 · 322748c · 322748c
1 parent 57c7bf7
commit 322748c
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 22 deletions.
diff --git a/build_overrides/build.gni b/build_overrides/build.gni
@@ -14,5 +14,5 @@
 
 declare_args() {
   # Root directory for build files.
-  build_root = "//third_party/connectedhomeip/build"
+  build_root = "//build"
 }
diff --git a/build_overrides/chip.gni b/build_overrides/chip.gni
@@ -14,6 +14,5 @@
 
 declare_args() {
   # Root directory for CHIP.
-  chip_root = "//third_party/connectedhomeip"
+  chip_root = "//"
 }
-
diff --git a/build_overrides/lwip.gni b/build_overrides/lwip.gni
@@ -16,7 +16,7 @@ import("//build_overrides/build.gni")
 
 declare_args() {
   # Root directory for lwIP.
-  lwip_root = "//third_party/connectedhomeip/third_party/lwip"
+  lwip_root = "//third_party/lwip"
 }
 
 lwip_remove_configs = [ "${build_root}/config/compiler:warnings_default" ]

diff --git a/build_overrides/nlassert.gni b/build_overrides/nlassert.gni
@@ -14,5 +14,5 @@
 
 declare_args() {
   # Root directory for nlassert.
-  nlassert_root = "//third_party/connectedhomeip/third_party/nlassert"
+  nlassert_root = "//third_party/nlassert"
 }
diff --git a/build_overrides/nlio.gni b/build_overrides/nlio.gni
@@ -14,5 +14,5 @@
 
 declare_args() {
   # Root directory for nlio.
-  nlio_root = "//third_party/connectedhomeip/third_party/nlio"
+  nlio_root = "//third_party/nlio"
 }
diff --git a/build_overrides/nlunit_test.gni b/build_overrides/nlunit_test.gni
@@ -14,5 +14,5 @@
 
 declare_args() {
   # Root directory for nlunit-test.
-  nlunit_test_root = "//third_party/connectedhomeip/third_party/nlunit-test"
+  nlunit_test_root = "//third_party/nlunit-test"
 }
diff --git a/build_overrides/pigweed.gni b/build_overrides/pigweed.gni
@@ -14,7 +14,7 @@
 
 declare_args() {
   # Location of the Pigweed repository.
-  dir_pigweed = "//third_party/connectedhomeip/third_party/pigweed/repo"
+  dir_pigweed = "//third_party/pigweed/repo"
 }
 
 import("$dir_pigweed/modules.gni")
diff --git a/examples/build_overrides/build.gni b/examples/build_overrides/build.gni
@@ -14,5 +14,5 @@
 
 declare_args() {
   # Root directory for build files.
-  build_root = "//third_party/connectedhomeip/build"
+  build_root = "//build"
 }
diff --git a/scripts/setup/constraints.txt b/scripts/setup/constraints.txt
@@ -237,7 +237,7 @@ prettytable==2.5.0
     # via
     #   mbed-ls
     #   mbed-os-tools
-prompt-toolkit==3.0.38
+prompt-toolkit==3.0.43
     # via ipython
 protobuf==3.20.1
     # via

diff --git a/src/lib/address_resolve/BUILD.gn b/src/lib/address_resolve/BUILD.gn
@@ -54,16 +54,16 @@ static_library("address_resolve") {
   }
 }
 
-#executable("address-resolve-tool") {
-#  sources = [ "tool.cpp" ]
+executable("address-resolve-tool") {
+  sources = [ "tool.cpp" ]
 
-#  cflags = [ "-Wconversion" ]
+  cflags = [ "-Wconversion" ]
 
-#  public_deps = [
-#    ":address_resolve",
-#    "${chip_root}/src/lib/support",
-#    "${chip_root}/src/platform/logging:stdio",
-#  ]
+  public_deps = [
+    ":address_resolve",
+    "${chip_root}/src/lib/support",
+    "${chip_root}/src/platform/logging:stdio",
+  ]
 
-#  output_dir = root_out_dir
-#}
+  output_dir = root_out_dir
+}
diff --git a/src/system/SystemStats.h b/src/system/SystemStats.h
@@ -73,8 +73,7 @@ enum
     kNumEntries
 };
 
-//typedef int8_t count_t;
-typedef mem_size_t count_t;
+typedef int8_t count_t;
 #define CHIP_SYS_STATS_COUNT_MAX INT8_MAX
 
 extern count_t ResourcesInUse[kNumEntries];