integrating comments

Author: Alami-Amine

.gitmodules

@@ -332,12 +332,16 @@
 [submodule "third_party/abseil-cpp/src"]
 	path = third_party/abseil-cpp/src
 	url = https://github.com/abseil/abseil-cpp.git
+	platforms = linux,darwin
 [submodule "third_party/fuzztest"]
 	path = third_party/fuzztest
 	url = https://github.com/google/fuzztest.git
+	platforms = linux,darwin
 [submodule "third_party/googletest"]
 	path = third_party/googletest
 	url = https://github.com/google/googletest
+	platforms = linux,darwin
 [submodule "third_party/re2/src"]
 	path = third_party/re2/src
 	url = https://github.com/google/re2.git
+	platforms = linux,darwin

build/chip/fuzz_test.gni

@@ -72,10 +72,9 @@ template("chip_fuzz_target") {
   }
 }
 
-# Define a fuzz target for chip using pw_fuzzer and Google FuzzTest Framework.
+# Define a fuzz target for Matter using pw_fuzzer and Google FuzzTest Framework.
 #
-# Fuzz generally only apply on the following environments:
-#   - linux and mac host builds when using clang
+# Google FuzzTest is only supported on Linux and MacOS using Clang:
 #
 # Sample usage
 #
@@ -91,16 +90,6 @@ template("chip_fuzz_target") {
 #
 #
 template("chip_pw_fuzz_target") {
-  if (!defined(invoker.sources)) {
-    sources = []
-  }
-  if (!defined(invoker.public_deps)) {
-    public_deps = []
-  }
-  if (!defined(invoker.deps)) {
-    deps = []
-  }
-
   if (defined(invoker.test_source)) {
     _test_output_dir = "${root_out_dir}/tests"
 
@@ -118,7 +107,7 @@ template("chip_pw_fuzz_target") {
                                "remove_configs",
                              ])
 
-      # TODO: remove this after pw_fuzzer implementation its integration with OSS-Fuzz is complete
+      # TODO: remove this after pw_fuzzer's integration with OSS-Fuzz is complete.
       #just a test for running FuzzTest with libfuzzer-compatibility mode, since this is the mode supported by OSS-fuzz
       # defines = [
       # "FUZZTEST_COMPATIBILITY_MODE=libfuzzer",
@@ -128,7 +117,7 @@ template("chip_pw_fuzz_target") {
       sources = invoker.test_source
       output_dir = _test_output_dir
 
-      deps += [ "$dir_pw_fuzzer:fuzztest" ]
+      deps = [ "$dir_pw_fuzzer:fuzztest" ]
 
       # this is necessary so FuzzTest is compiled into an executable in third_party/pigweed/repo/pw_unit_test/test.gni
       # otherwise it will be built successfully but with FuzzTarget.DISABLED.ninja and no executable.

build/config/BUILDCONFIG.gn

@@ -47,8 +47,6 @@ _chip_defaults = {
 declare_args() {
   # Toolchain to use for host. This is usually set by default.
   host_toolchain = ""
-
-  is_pw_fuzz = false
 }
 
 if (host_toolchain == "") {

build/toolchain/pw_fuzzer/BUILD.gn

@@ -26,13 +26,13 @@ gcc_toolchain("chip_pw_fuzztest") {
   forward_variables_from(pw_target_toolchain_host.clang_fuzz, "*", [ "name" ])
 
   toolchain_args = {
-    #This is needed to have the defaults passed from pw_target_toolchain_host.clang_fuzz to the current scope
+    # This is needed to have the defaults passed from pw_target_toolchain_host.clang_fuzz to the current scope
     forward_variables_from(defaults, "*")
 
     pw_unit_test_MAIN = "$dir_pw_fuzzer:fuzztest_main"
     pw_unit_test_BACKEND = "$dir_pw_fuzzer:gtest"
 
-    # below three lines are needed by gcc_toolchain template
+    # The next three lines are needed by the gcc_toolchain template
     current_os = host_os
     current_cpu = host_cpu
     is_clang = true
@@ -43,7 +43,7 @@ gcc_toolchain("chip_pw_fuzztest") {
     # discussion on: https://discord.com/channels/691686718377558037/1275092695764959232
     remove_default_configs = [ "$dir_pw_toolchain/host_clang:linux_sysroot" ]
 
-    #when is_debug = True, we pass -O0 to cflags and ldflags, while upstream pw_fuzzer toolchain defines "optimize_speed" config that passes -O2.
+    # when is_debug = true, we pass -O0 to cflags and ldflags, while upstream pw_fuzzer toolchain defines "optimize_speed" config that passes -O2.
     # This condition was added to prevent mixing the flags
     if (is_debug) {
       remove_default_configs += [ "$dir_pw_build:optimize_speed" ]
@@ -63,8 +63,8 @@ gcc_toolchain("chip_pw_fuzztest") {
     dir_pw_third_party_fuzztest = "//third_party/fuzztest"
     dir_pw_third_party_googletest = "//third_party/googletest"
 
-    # TODO: Seems that re2 support within FuzzTest was deprecated, keeping it defined is giving warning
-    #Remove if re2 is indeed not needed
+    # TODO: Seems that re2 support within FuzzTest was deprecated, keeping it defined is triggering warning
+    # Remove if re2 is indeed not needed
     # dir_pw_third_party_re2 = "//third_party/re2/src"
   }
 }

docs/guides/BUILDING.md

@@ -392,8 +392,8 @@ executed manually.
 ./scripts/build/build_examples.py --target linux-x64-tests-clang-pw-fuzztest build
 ```
 
-NOTE: `asan` is enabled by default in FuzzTest, so adding to build_examples
-target does not make a difference.
+NOTE: `asan` is enabled by default in FuzzTest, so please do not add it in
+build_examples.py invocation.
 
 Tests will be located in:
 `out/linux-x64-tests-clang-pw-fuzztest/chip_pw_fuzztest/tests/` where

docs/testing/fuzz_testing.md

@@ -98,7 +98,7 @@ FUZZ_TEST(MinimalmDNS, TxtResponderFuzz).WithDomains(Arbitrary<vector<uint8_t>>(
     invocation. Example:
 
 ```cpp
-AnyProtocolID()
+auto AnyProtocolID()
 {
     return ElementOf({ chip::Protocols::SecureChannel::Id, chip::Protocols::InteractionModel::Id, chip::Protocols::BDX::Id,
                        chip::Protocols::UserDirectedCommissioning::Id });

scripts/build/build/targets.py

@@ -78,7 +78,7 @@ def BuildHostFakeTarget():
     target.AppendModifier("ossfuzz", fuzzing_type=HostFuzzingType.OSS_FUZZ).OnlyIfRe(
         "-clang").ExceptIfRe('-libfuzzer')
     target.AppendModifier("pw-fuzztest", fuzzing_type=HostFuzzingType.PW_FUZZTEST).OnlyIfRe(
-        "-clang").ExceptIfRe('-(libfuzzer|ossfuzz)')
+        "-clang").ExceptIfRe('-(libfuzzer|ossfuzz|asan)')
     target.AppendModifier('coverage', use_coverage=True).OnlyIfRe(
         '-(chip-tool|all-clusters)')
     target.AppendModifier('dmalloc', use_dmalloc=True)
@@ -181,7 +181,7 @@ def BuildHostTarget():
     target.AppendModifier("ossfuzz", fuzzing_type=HostFuzzingType.OSS_FUZZ).OnlyIfRe(
         "-clang").ExceptIfRe('-libfuzzer')
     target.AppendModifier("pw-fuzztest", fuzzing_type=HostFuzzingType.PW_FUZZTEST).OnlyIfRe(
-        "-clang").ExceptIfRe('-(libfuzzer|ossfuzz)')
+        "-clang").ExceptIfRe('-(libfuzzer|ossfuzz|asan)')
     target.AppendModifier('coverage', use_coverage=True).OnlyIfRe(
         '-(chip-tool|all-clusters|tests)')
     target.AppendModifier('dmalloc', use_dmalloc=True)

scripts/build/builders/host.py

@@ -381,7 +381,7 @@ def __init__(self, root, runner, app: HostApp, board=HostBoard.NATIVE,
         elif fuzzing_type == HostFuzzingType.OSS_FUZZ:
             self.extra_gn_options.append('oss_fuzz=true')
         elif fuzzing_type == HostFuzzingType.PW_FUZZTEST:
-            self.extra_gn_options.append('is_pw_fuzz=true pw_enable_fuzz_test_targets=true')
+            self.extra_gn_options.append('pw_enable_fuzz_test_targets=true')
 
         if imgui_ui:
             self.extra_gn_options.append('chip_examples_enable_imgui_ui=true')

src/credentials/tests/FuzzChipCertPW.cpp

@@ -56,7 +56,7 @@ void ChipCertFuzzer(const std::vector<std::uint8_t> & bytes)
     }
 
     {
-        // TODO: #34352 To Move this to a Fixture once Errors related to FuzzTest Fixtures are resolved
+        // TODO: #35369 Move this to a Fixture once Errors related to FuzzTest Fixtures are resolved
         ASSERT_EQ(chip::Platform::MemoryInit(), CHIP_NO_ERROR);
         ValidateChipRCAC(span);
         chip::Platform::MemoryShutdown();