Merge branch 'master' into MdnsDiscovery-PythonTests

raul-marquez-csa · Feb 1, 2024 · a75410f · a75410f
2 parents 2422cc2 + a77e01c
commit a75410f
Show file tree

Hide file tree

Showing 27 changed files with 112 additions and 85 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
diff --git a/BUILD.gn b/BUILD.gn
@@ -16,7 +16,6 @@ import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 import("//build_overrides/mbedtls.gni")
 import("//build_overrides/nlassert.gni")
-import("//build_overrides/nlio.gni")
 import("//build_overrides/nlunit_test.gni")
 import("//build_overrides/pigweed.gni")
 
@@ -136,7 +135,6 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
       "${chip_root}/src/system",
       "${chip_root}/src/transport",
       "${nlassert_root}:nlassert",
-      "${nlio_root}:nlio",
       "${nlunit_test_root}:nlunit-test",
     ]
 

diff --git a/src/BUILD.gn b/src/BUILD.gn
@@ -43,9 +43,6 @@ config("includes") {
     include_dirs += [ "${chip_external_platform_include_dir}" ]
   }
 
-  # TODO: generated file dependency should be a lib NOT an include
-  include_dirs += [ "${chip_root}/zzz_generated/app-common" ]
-
   defines = [ "CHIP_HAVE_CONFIG_H=1" ]
 
   # Make __FILE__ and related macros relative to chip_root

diff --git a/src/app/BUILD.gn b/src/app/BUILD.gn
@@ -104,20 +104,6 @@ source_set("global-attributes") {
   ]
 }
 
-source_set("pre-encoded-value") {
-  sources = [
-    "data-model/FabricScopedPreEncodedValue.cpp",
-    "data-model/FabricScopedPreEncodedValue.h",
-    "data-model/PreEncodedValue.cpp",
-    "data-model/PreEncodedValue.h",
-  ]
-
-  deps = [
-    "${chip_root}/src/lib/core",
-    "${chip_root}/src/lib/support",
-  ]
-}
-
 source_set("subscription-manager") {
   sources = [ "SubscriptionsInfoProvider.h" ]
 
@@ -335,8 +321,8 @@ static_library("app") {
     ":app_config",
     ":global-attributes",
     ":interaction-model",
-    ":pre-encoded-value",
     ":revision_info",
+    "${chip_root}/src/app/data-model",
     "${chip_root}/src/app/icd/server:icd-server-config",
     "${chip_root}/src/lib/address_resolve",
     "${chip_root}/src/lib/support",

diff --git a/src/app/chip_data_model.gni b/src/app/chip_data_model.gni
@@ -376,6 +376,7 @@ template("chip_data_model") {
       ":${_data_model_name}_zapgen",
       "${chip_root}/src/app",
       "${chip_root}/src/app/common:cluster-objects",
+      "${chip_root}/src/app/common:enums",
       "${chip_root}/src/controller",
       "${chip_root}/src/lib/core",
       "${chip_root}/src/lib/support",

diff --git a/src/app/common/BUILD.gn b/src/app/common/BUILD.gn
@@ -14,21 +14,41 @@
 
 import("//build_overrides/chip.gni")
 
+config("includes") {
+  include_dirs = [ "${chip_root}/zzz_generated/app-common" ]
+}
+
 static_library("cluster-objects") {
   output_name = "libClusterObjects"
 
   sources = [
-    "${chip_root}/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h",
-    "${chip_root}/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h",
     "${chip_root}/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp",
     "${chip_root}/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h",
   ]
 
   public_deps = [
+    "${chip_root}/src/app/data-model",
     "${chip_root}/src/lib/core",
     "${chip_root}/src/lib/support",
     "${chip_root}/src/protocols/interaction_model",
   ]
 
-  defines = []
+  public_configs = [ ":includes" ]
+}
+
+source_set("enums") {
+  sources = [
+    "${chip_root}/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h",
+    "${chip_root}/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h",
+  ]
+
+  public_configs = [ ":includes" ]
+}
+
+source_set("simulated") {
+  sources = [ "${chip_root}/zzz_generated/app-common/app-common/zap-generated/tests/simulated-cluster-objects.h" ]
+
+  public_deps = [ ":enums" ]
+
+  public_configs = [ ":includes" ]
 }
diff --git a/src/app/data-model/BUILD.gn b/src/app/data-model/BUILD.gn
@@ -0,0 +1,47 @@
+# Copyright (c) 2024 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import("//build_overrides/chip.gni")
+
+source_set("data-model") {
+  sources = [
+    "BasicTypes.h",
+    "DecodableList.h",
+    "Decode.h",
+    "Encode.h",
+    "FabricScoped.h",
+    "FabricScopedPreEncodedValue.cpp",
+    "FabricScopedPreEncodedValue.h",
+    "List.h",
+    "NullObject.h",
+    "Nullable.h",
+    "PreEncodedValue.cpp",
+    "PreEncodedValue.h",
+    "TagBoundEncoder.h",
+    "WrappedStructEncoder.h",
+  ]
+
+  deps = [
+    # TODO: dependencies NOT declared because they are not part of
+    #       any GN dependency. Overall src/app seems to suffer greatly
+    #       of this, in part due to zap-generated code dependency.
+    #
+    #  - app/util/attribute-storage-null-handling.h
+    #  - app/ConcreteAttributePath.h
+    #
+    "${chip_root}/src/app/common:enums",
+    "${chip_root}/src/lib/core",
+    "${chip_root}/src/lib/support",
+    "${chip_root}/src/protocols/interaction_model",
+  ]
+}
diff --git a/src/app/tests/suites/commands/delay/BUILD.gn b/src/app/tests/suites/commands/delay/BUILD.gn
@@ -26,6 +26,7 @@ static_library("delay") {
   cflags = [ "-Wconversion" ]
 
   public_deps = [
+    "${chip_root}/src/app/common:simulated",
     "${chip_root}/src/lib/support",
     "${chip_root}/src/platform",
     "${chip_root}/src/system",

diff --git a/src/app/tests/suites/commands/discovery/BUILD.gn b/src/app/tests/suites/commands/discovery/BUILD.gn
@@ -29,6 +29,7 @@ static_library("discovery") {
 
   public_deps = [
     "${chip_root}/src/app",
+    "${chip_root}/src/app/common:simulated",
     "${chip_root}/src/lib/address_resolve",
     "${chip_root}/src/lib/support",
   ]

diff --git a/src/app/tests/suites/commands/log/BUILD.gn b/src/app/tests/suites/commands/log/BUILD.gn
@@ -25,5 +25,8 @@ static_library("log") {
 
   cflags = [ "-Wconversion" ]
 
-  public_deps = [ "${chip_root}/src/lib/support" ]
+  public_deps = [
+    "${chip_root}/src/app/common:simulated",
+    "${chip_root}/src/lib/support",
+  ]
 }
diff --git a/src/app/tests/suites/commands/system/BUILD.gn b/src/app/tests/suites/commands/system/BUILD.gn
@@ -25,5 +25,8 @@ static_library("system") {
 
   cflags = [ "-Wconversion" ]
 
-  public_deps = [ "${chip_root}/src/lib/support" ]
+  public_deps = [
+    "${chip_root}/src/app/common:simulated",
+    "${chip_root}/src/lib/support",
+  ]
 }
diff --git a/src/inet/BUILD.gn b/src/inet/BUILD.gn
@@ -16,7 +16,6 @@ import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 import("//build_overrides/nlassert.gni")
 import("//build_overrides/nlfaultinjection.gni")
-import("//build_overrides/nlio.gni")
 
 import("${chip_root}/build/chip/buildconfig_header.gni")
 import("${chip_root}/build/chip/tests.gni")
@@ -104,7 +103,6 @@ static_library("inet") {
     "${chip_root}/src/lib/support",
     "${chip_root}/src/platform:platform_config_header",
     "${chip_root}/src/system",
-    "${nlio_root}:nlio",
   ]
 
   if (chip_system_config_use_lwip) {

diff --git a/src/lib/core/BUILD.gn b/src/lib/core/BUILD.gn
@@ -104,6 +104,11 @@ source_set("error") {
   ]
 }
 
+source_set("encoding") {
+  sources = [ "CHIPEncoding.h" ]
+  public_deps = [ "${nlio_root}:nlio" ]
+}
+
 source_set("types") {
   sources = [
     "CHIPSafeCasts.h",
@@ -125,14 +130,9 @@ static_library("core") {
   output_name = "libChipCore"
 
   sources = [
-    # For now cluster enum/bitmap definitions are in zzz-generated.
-    # We should consider putting them directly in this directory
-    # instead.
-    "${chip_root}/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h",
     "CASEAuthTag.h",
     "CHIPCallback.h",
     "CHIPCore.h",
-    "CHIPEncoding.h",
     "CHIPKeyIds.cpp",
     "CHIPKeyIds.h",
     "CHIPPersistentStorageDelegate.h",
@@ -171,11 +171,11 @@ static_library("core") {
   public_deps = [
     ":chip_config_header",
     ":error",
+    "${chip_root}/src/app/common:enums",
     "${chip_root}/src/ble",
     "${chip_root}/src/inet",
     "${chip_root}/src/lib/support",
     "${chip_root}/src/system",
-    "${nlio_root}:nlio",
   ]
 
   allow_circular_includes_from = [

diff --git a/src/lib/support/BUILD.gn b/src/lib/support/BUILD.gn
@@ -16,7 +16,6 @@ import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 import("//build_overrides/nlassert.gni")
 import("//build_overrides/nlfaultinjection.gni")
-import("//build_overrides/nlio.gni")
 import("//build_overrides/nlunit_test.gni")
 import("//build_overrides/pigweed.gni")
 
@@ -256,12 +255,12 @@ static_library("support") {
     ":verifymacros",
     ":verifymacros_no_logging",
     "${chip_root}/src/lib/core:chip_config_header",
+    "${chip_root}/src/lib/core:encoding",
     "${chip_root}/src/lib/core:error",
     "${chip_root}/src/lib/core:types",
     "${chip_root}/src/platform:platform_config_header",
     "${chip_root}/src/system:system_config_header",
     "${nlassert_root}:nlassert",
-    "${nlio_root}:nlio",
   ]
 
   # These are needed because we include CHIPCore.h, which uses config

diff --git a/src/messaging/tests/BUILD.gn b/src/messaging/tests/BUILD.gn
@@ -14,7 +14,6 @@
 
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
-import("//build_overrides/nlio.gni")
 import("//build_overrides/nlunit_test.gni")
 
 import("${chip_root}/build/chip/chip_test_suite.gni")
@@ -37,7 +36,6 @@ static_library("helpers") {
     "${chip_root}/src/protocols",
     "${chip_root}/src/transport",
     "${chip_root}/src/transport/tests:helpers",
-    "${nlio_root}:nlio",
   ]
 }
 
@@ -78,7 +76,6 @@ chip_test_suite_using_nltest("tests") {
     "${chip_root}/src/protocols",
     "${chip_root}/src/transport",
     "${chip_root}/src/transport/raw/tests:helpers",
-    "${nlio_root}:nlio",
     "${nlunit_test_root}:nlunit-test",
   ]
 

diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn
@@ -14,7 +14,6 @@
 
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
-import("//build_overrides/nlio.gni")
 import("//build_overrides/pigweed.gni")
 
 import("${build_root}/config/linux/pkg_config.gni")

diff --git a/src/platform/Linux/ThreadStackManagerImpl.cpp b/src/platform/Linux/ThreadStackManagerImpl.cpp
@@ -28,10 +28,6 @@
 
 #include <app-common/zap-generated/ids/Attributes.h>
 
-#include <nlbyteorder.hpp>
-#include <nlio-byteorder.hpp>
-#include <nlio.hpp>
-
 using namespace ::chip::app;
 using namespace ::chip::app::Clusters;
 using namespace chip::DeviceLayer::NetworkCommissioning;

diff --git a/src/platform/webos/ThreadStackManagerImpl.cpp b/src/platform/webos/ThreadStackManagerImpl.cpp
@@ -27,10 +27,6 @@
 
 #include <app-common/zap-generated/ids/Attributes.h>
 
-#include <nlbyteorder.hpp>
-#include <nlio-byteorder.hpp>
-#include <nlio.hpp>
-
 using namespace ::chip::app;
 using namespace ::chip::app::Clusters;
 using namespace chip::DeviceLayer::NetworkCommissioning;

diff --git a/src/protocols/bdx/tests/BUILD.gn b/src/protocols/bdx/tests/BUILD.gn
@@ -14,7 +14,6 @@
 
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
-import("//build_overrides/nlio.gni")
 import("//build_overrides/nlunit_test.gni")
 
 import("${chip_root}/build/chip/chip_test_suite.gni")
@@ -33,7 +32,6 @@ chip_test_suite_using_nltest("tests") {
     "${chip_root}/src/lib/support",
     "${chip_root}/src/lib/support:testing_nlunit",
     "${chip_root}/src/protocols/bdx",
-    "${nlio_root}:nlio",
     "${nlunit_test_root}:nlunit-test",
   ]
 

diff --git a/src/protocols/secure_channel/tests/BUILD.gn b/src/protocols/secure_channel/tests/BUILD.gn
@@ -1,6 +1,5 @@
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
-import("//build_overrides/nlio.gni")
 import("//build_overrides/nlunit_test.gni")
 import("${chip_root}/build/chip/chip_test_suite.gni")
 import("${chip_root}/src/app/icd/icd.gni")
@@ -35,7 +34,6 @@ chip_test_suite_using_nltest("tests") {
     "${chip_root}/src/protocols",
     "${chip_root}/src/protocols/secure_channel",
     "${chip_root}/src/transport/raw/tests:helpers",
-    "${nlio_root}:nlio",
     "${nlunit_test_root}:nlunit-test",
   ]
 

diff --git a/src/protocols/user_directed_commissioning/tests/BUILD.gn b/src/protocols/user_directed_commissioning/tests/BUILD.gn
@@ -12,7 +12,6 @@
 
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
-import("//build_overrides/nlio.gni")
 import("//build_overrides/nlunit_test.gni")
 
 import("${chip_root}/build/chip/chip_test_suite.gni")
@@ -27,7 +26,6 @@ chip_test_suite_using_nltest("tests") {
     "${chip_root}/src/lib/support",
     "${chip_root}/src/lib/support:testing_nlunit",
     "${chip_root}/src/protocols",
-    "${nlio_root}:nlio",
     "${nlunit_test_root}:nlunit-test",
   ]
 

diff --git a/src/transport/BUILD.gn b/src/transport/BUILD.gn
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import("//build_overrides/chip.gni")
-import("//build_overrides/nlio.gni")
 import("//build_overrides/pigweed.gni")
 import("${chip_root}/src/ble/ble.gni")
 import("${chip_root}/src/lib/core/core.gni")
@@ -68,7 +67,6 @@ static_library("transport") {
     "${chip_root}/src/tracing",
     "${chip_root}/src/tracing:macros",
     "${chip_root}/src/transport/raw",
-    "${nlio_root}:nlio",
   ]
 
   if (chip_enable_transport_trace) {