Move the configuration to the existing declare_args() region

Not enabling Wi-Fi-PAF in the test example

Signed-off-by: Lo,Chin-Ran <[email protected]>

Author: crlonxp

.github/workflows/build.yaml

@@ -193,7 +193,7 @@ jobs:
             - name: Setup and Build Simulated Device
               run: |
                   BUILD_TYPE=simulated
-                  GN_ARGS='chip_tests_zap_config="app1" chip_project_config_include_dirs=["../../examples/placeholder/linux/apps/app1/include", "../../config/standalone"] chip_config_network_layer_ble=false'
+                  GN_ARGS='chip_tests_zap_config="app1" chip_project_config_include_dirs=["../../examples/placeholder/linux/apps/app1/include", "../../config/standalone"] chip_config_network_layer_ble=false chip_device_config_enable_wifipaf=false'
                   CHIP_ROOT_PATH=examples/placeholder/linux
                   CHIP_ROOT_PATH="$CHIP_ROOT_PATH" BUILD_TYPE="$BUILD_TYPE" scripts/build/gn_gen.sh --args="$GN_ARGS"
                   scripts/run_in_build_env.sh "ninja -C ./out/$BUILD_TYPE"

.github/workflows/tests.yaml

@@ -38,7 +38,7 @@ jobs:
 
         strategy:
             matrix:
-                build_variant: [no-ble-no-shell-tsan-clang]
+                build_variant: [no-ble-no-wifipaf-no-shell-tsan-clang]
                 chip_tool: [""]
         env:
             BUILD_VARIANT: ${{matrix.build_variant}}

scripts/build/build/targets.py

@@ -122,11 +122,11 @@ def BuildHostTarget():
         TargetPart('shell', app=HostApp.SHELL),
         TargetPart('ota-provider', app=HostApp.OTA_PROVIDER, enable_ble=False),
         TargetPart('ota-requestor', app=HostApp.OTA_REQUESTOR,
-                   enable_ble=False),
+                   enable_ble=False, enable_wifipaf=False),
         TargetPart('simulated-app1', app=HostApp.SIMULATED_APP1,
-                   enable_ble=False),
+                   enable_ble=False, enable_wifipaf=False),
         TargetPart('simulated-app2', app=HostApp.SIMULATED_APP2,
-                   enable_ble=False),
+                   enable_ble=False, enable_wifipaf=False),
         TargetPart('python-bindings', app=HostApp.PYTHON_BINDINGS),
         TargetPart('tv-app', app=HostApp.TV_APP),
         TargetPart('tv-casting-app', app=HostApp.TV_CASTING),
@@ -173,6 +173,7 @@ def BuildHostTarget():
         'no-interactive', interactive_mode=False).OnlyIfRe('-chip-tool')
     target.AppendModifier("ipv6only", enable_ipv4=False)
     target.AppendModifier("no-ble", enable_ble=False)
+    target.AppendModifier("no-wifipaf", enable_wifipaf=False)
     target.AppendModifier("no-wifi", enable_wifi=False)
     target.AppendModifier("no-thread", enable_thread=False)
     target.AppendModifier('no-shell', disable_shell=True)

scripts/build/builders/host.py

@@ -350,7 +350,7 @@ def PlatformName(self):
 class HostBuilder(GnBuilder):
 
     def __init__(self, root, runner, app: HostApp, board=HostBoard.NATIVE,
-                 enable_ipv4=True, enable_ble=True, enable_wifi=True,
+                 enable_ipv4=True, enable_ble=True, enable_wifi=True, enable_wifipaf=True,
                  enable_thread=True, use_tsan=False, use_asan=False, use_ubsan=False,
                  separate_event_loop=True, fuzzing_type: HostFuzzingType = HostFuzzingType.NONE, use_clang=False,
                  interactive_mode=True, extra_tests=False, use_nl_fault_injection=False, use_platform_mdns=False, enable_rpcs=False,
@@ -383,6 +383,9 @@ def __init__(self, root, runner, app: HostApp, board=HostBoard.NATIVE,
             self.extra_gn_options.append('chip_config_network_layer_ble=false')
             self.extra_gn_options.append('chip_enable_ble=false')
 
+        if not enable_wifipaf:
+            self.extra_gn_options.append('chip_device_config_enable_wifipaf=false')
+
         if not enable_wifi:
             self.extra_gn_options.append('chip_enable_wifi=false')
 

scripts/examples/gn_build_test_example.sh

@@ -44,6 +44,7 @@ function runGN() {
     GN_ARGS="chip_tests_zap_config=\"$APP_DIR\""
     GN_ARGS+="chip_project_config_include_dirs=[\"$INPUT_DIR/apps/$APP_DIR/include\", \"$CHIP_ROOT/config/standalone\"]"
     GN_ARGS+="chip_config_network_layer_ble=false"
+    GN_ARGS+="chip_device_config_enable_wifipaf=false"
 
     gn gen --check --fail-on-unused-args --root=examples/placeholder/linux "$CHIP_ROOT/out/$APP_DIR" --args="$GN_ARGS"
 }

src/platform/device.gni

@@ -123,9 +123,7 @@ declare_args() {
 declare_args() {
   # Enable Joint Fabric features
   chip_device_config_enable_joint_fabric = false
-}
 
-declare_args() {
   # Include wifi-paf to commission the device or not
   # This is a feature of Wi-Fi spec that it can be enabled if wifi is enabled
   # and the supplicant can support.