diff --git a/examples/chip-tool/args.gni b/examples/chip-tool/args.gni index a76f3e8996ce3c..5b638f780f9acb 100644 --- a/examples/chip-tool/args.gni +++ b/examples/chip-tool/args.gni @@ -16,6 +16,8 @@ import("//build_overrides/chip.gni") import("${chip_root}/config/standalone/args.gni") +chip_build_example_creds = true + chip_device_project_config_include = "" chip_project_config_include = "" chip_system_project_config_include = "" diff --git a/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp b/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp index 46b19a0d49ee88..4ead635f1f7287 100644 --- a/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp +++ b/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp @@ -77,8 +77,8 @@ CHIP_ERROR CastingServer::SetRotatingDeviceIdUniqueId(chip::Optional/dev/null' # Setting up Android deps through Gradle python3 third_party/android_deps/set_up_android_deps.py +# Generating android-arm-tv-casting-app-no-debug +gn gen --check --fail-on-unused-args {out}/android-arm-tv-casting-app-no-debug '--args=target_os="android" target_cpu="arm" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" is_debug=false chip_config_network_layer_ble=false ' --root={root}/examples/tv-casting-app/android/ + +# Accepting NDK licenses @ tools +bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null' + +# Setting up Android deps through Gradle +python3 third_party/android_deps/set_up_android_deps.py + # Generating android-arm-tv-server gn gen --check --fail-on-unused-args {out}/android-arm-tv-server '--args=target_os="android" target_cpu="arm" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" chip_config_network_layer_ble=false ' --root={root}/examples/tv-app/android/ @@ -79,6 +88,15 @@ bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null' # Setting up Android deps through Gradle python3 third_party/android_deps/set_up_android_deps.py +# Generating android-arm-tv-server-no-debug +gn gen --check --fail-on-unused-args {out}/android-arm-tv-server-no-debug '--args=target_os="android" target_cpu="arm" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" is_debug=false chip_config_network_layer_ble=false ' --root={root}/examples/tv-app/android/ + +# Accepting NDK licenses @ tools +bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null' + +# Setting up Android deps through Gradle +python3 third_party/android_deps/set_up_android_deps.py + # Generating android-arm64-chip-test gn gen --check --fail-on-unused-args {out}/android-arm64-chip-test '--args=target_os="android" target_cpu="arm64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" ' @@ -106,6 +124,15 @@ bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null' # Setting up Android deps through Gradle python3 third_party/android_deps/set_up_android_deps.py +# Generating android-arm64-tv-casting-app-no-debug +gn gen --check --fail-on-unused-args {out}/android-arm64-tv-casting-app-no-debug '--args=target_os="android" target_cpu="arm64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" is_debug=false chip_config_network_layer_ble=false ' --root={root}/examples/tv-casting-app/android/ + +# Accepting NDK licenses @ tools +bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null' + +# Setting up Android deps through Gradle +python3 third_party/android_deps/set_up_android_deps.py + # Generating android-arm64-tv-server gn gen --check --fail-on-unused-args {out}/android-arm64-tv-server '--args=target_os="android" target_cpu="arm64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" chip_config_network_layer_ble=false ' --root={root}/examples/tv-app/android/ @@ -115,6 +142,15 @@ bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null' # Setting up Android deps through Gradle python3 third_party/android_deps/set_up_android_deps.py +# Generating android-arm64-tv-server-no-debug +gn gen --check --fail-on-unused-args {out}/android-arm64-tv-server-no-debug '--args=target_os="android" target_cpu="arm64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" is_debug=false chip_config_network_layer_ble=false ' --root={root}/examples/tv-app/android/ + +# Accepting NDK licenses @ tools +bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null' + +# Setting up Android deps through Gradle +python3 third_party/android_deps/set_up_android_deps.py + # Generating android-x64-chip-tool gn gen --check --fail-on-unused-args {out}/android-x64-chip-tool '--args=target_os="android" target_cpu="x64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" ' @@ -133,6 +169,15 @@ bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null' # Setting up Android deps through Gradle python3 third_party/android_deps/set_up_android_deps.py +# Generating android-x64-tv-server-no-debug +gn gen --check --fail-on-unused-args {out}/android-x64-tv-server-no-debug '--args=target_os="android" target_cpu="x64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" is_debug=false chip_config_network_layer_ble=false ' --root={root}/examples/tv-app/android/ + +# Accepting NDK licenses @ tools +bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null' + +# Setting up Android deps through Gradle +python3 third_party/android_deps/set_up_android_deps.py + # Generating android-x86-chip-tool gn gen --check --fail-on-unused-args {out}/android-x86-chip-tool '--args=target_os="android" target_cpu="x86" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" ' @@ -148,6 +193,15 @@ gn gen --check --fail-on-unused-args {out}/android-x86-tv-server '--args=target_ # Accepting NDK licenses @ tools bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null' +# Setting up Android deps through Gradle +python3 third_party/android_deps/set_up_android_deps.py + +# Generating android-x86-tv-server-no-debug +gn gen --check --fail-on-unused-args {out}/android-x86-tv-server-no-debug '--args=target_os="android" target_cpu="x86" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" is_debug=false chip_config_network_layer_ble=false ' --root={root}/examples/tv-app/android/ + +# Accepting NDK licenses @ tools +bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null' + # Generating bl602-light gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/bouffalolab/bl602 '--args=custom_toolchain="{root}/../../examples/platform/bouffalolab/common/toolchain:riscv_gcc" bl602_board="BL-HWC-G1"' {out}/bl602-light @@ -1343,6 +1397,25 @@ cp {out}/android-arm-tv-casting-app/lib/TvCastingApp.jar {root}/examples/tv-cast # Building Example android-arm-tv-casting-app {root}/examples/tv-casting-app/android/App/gradlew -p {root}/examples/tv-casting-app/android/App/ -PmatterBuildSrcDir={out}/android-arm-tv-casting-app -PmatterSdkSourceBuild=false -PbuildDir={out}/android-arm-tv-casting-app assembleDebug +# Building JNI android-arm-tv-casting-app-no-debug +ninja -C {out}/android-arm-tv-casting-app-no-debug + +# Prepare Native libs android-arm-tv-casting-app-no-debug +mkdir -p {root}/examples/tv-casting-app/android/App/app/libs/jniLibs/armeabi-v7a + +cp {out}/android-arm-tv-casting-app-no-debug/lib/jni/armeabi-v7a/libc++_shared.so {root}/examples/tv-casting-app/android/App/app/libs/jniLibs/armeabi-v7a/libc++_shared.so + +cp {out}/android-arm-tv-casting-app-no-debug/lib/jni/armeabi-v7a/libTvCastingApp.so {root}/examples/tv-casting-app/android/App/app/libs/jniLibs/armeabi-v7a/libTvCastingApp.so + +cp {out}/android-arm-tv-casting-app-no-debug/lib/third_party/connectedhomeip/src/platform/android/AndroidPlatform.jar {root}/examples/tv-casting-app/android/App/app/libs/AndroidPlatform.jar + +cp {out}/android-arm-tv-casting-app-no-debug/lib/third_party/connectedhomeip/src/app/server/java/CHIPAppServer.jar {root}/examples/tv-casting-app/android/App/app/libs/CHIPAppServer.jar + +cp {out}/android-arm-tv-casting-app-no-debug/lib/TvCastingApp.jar {root}/examples/tv-casting-app/android/App/app/libs/TvCastingApp.jar + +# Building Example android-arm-tv-casting-app-no-debug +{root}/examples/tv-casting-app/android/App/gradlew -p {root}/examples/tv-casting-app/android/App/ -PmatterBuildSrcDir={out}/android-arm-tv-casting-app-no-debug -PmatterSdkSourceBuild=false -PbuildDir={out}/android-arm-tv-casting-app-no-debug assembleDebug + # Building JNI android-arm-tv-server ninja -C {out}/android-arm-tv-server @@ -1369,6 +1442,32 @@ cp {out}/android-arm-tv-server/lib/TvApp.jar {root}/examples/tv-app/android/App/ # Building Example android-arm-tv-server, module content-app {root}/examples/tv-app/android/App/gradlew -p {root}/examples/tv-app/android/App/ -PmatterBuildSrcDir={out}/android-arm-tv-server -PmatterSdkSourceBuild=false -PbuildDir={out}/android-arm-tv-server/content-app :content-app:assembleDebug +# Building JNI android-arm-tv-server-no-debug +ninja -C {out}/android-arm-tv-server-no-debug + +# Prepare Native libs android-arm-tv-server-no-debug +mkdir -p {root}/examples/tv-app/android/App/app/libs/jniLibs/armeabi-v7a + +cp {out}/android-arm-tv-server-no-debug/lib/jni/armeabi-v7a/libSetupPayloadParser.so {root}/examples/tv-app/android/App/app/libs/jniLibs/armeabi-v7a/libSetupPayloadParser.so + +cp {out}/android-arm-tv-server-no-debug/lib/jni/armeabi-v7a/libc++_shared.so {root}/examples/tv-app/android/App/app/libs/jniLibs/armeabi-v7a/libc++_shared.so + +cp {out}/android-arm-tv-server-no-debug/lib/jni/armeabi-v7a/libTvApp.so {root}/examples/tv-app/android/App/app/libs/jniLibs/armeabi-v7a/libTvApp.so + +cp {out}/android-arm-tv-server-no-debug/lib/third_party/connectedhomeip/src/setup_payload/java/SetupPayloadParser.jar {root}/examples/tv-app/android/App/app/libs/SetupPayloadParser.jar + +cp {out}/android-arm-tv-server-no-debug/lib/third_party/connectedhomeip/src/platform/android/AndroidPlatform.jar {root}/examples/tv-app/android/App/app/libs/AndroidPlatform.jar + +cp {out}/android-arm-tv-server-no-debug/lib/third_party/connectedhomeip/src/app/server/java/CHIPAppServer.jar {root}/examples/tv-app/android/App/app/libs/CHIPAppServer.jar + +cp {out}/android-arm-tv-server-no-debug/lib/TvApp.jar {root}/examples/tv-app/android/App/app/libs/TvApp.jar + +# Building Example android-arm-tv-server-no-debug, module platform-app +{root}/examples/tv-app/android/App/gradlew -p {root}/examples/tv-app/android/App/ -PmatterBuildSrcDir={out}/android-arm-tv-server-no-debug -PmatterSdkSourceBuild=false -PbuildDir={out}/android-arm-tv-server-no-debug/platform-app :platform-app:assembleDebug + +# Building Example android-arm-tv-server-no-debug, module content-app +{root}/examples/tv-app/android/App/gradlew -p {root}/examples/tv-app/android/App/ -PmatterBuildSrcDir={out}/android-arm-tv-server-no-debug -PmatterSdkSourceBuild=false -PbuildDir={out}/android-arm-tv-server-no-debug/content-app :content-app:assembleDebug + # Building JNI android-arm64-chip-test ninja -C {out}/android-arm64-chip-test @@ -1430,6 +1529,25 @@ cp {out}/android-arm64-tv-casting-app/lib/TvCastingApp.jar {root}/examples/tv-ca # Building Example android-arm64-tv-casting-app {root}/examples/tv-casting-app/android/App/gradlew -p {root}/examples/tv-casting-app/android/App/ -PmatterBuildSrcDir={out}/android-arm64-tv-casting-app -PmatterSdkSourceBuild=false -PbuildDir={out}/android-arm64-tv-casting-app assembleDebug +# Building JNI android-arm64-tv-casting-app-no-debug +ninja -C {out}/android-arm64-tv-casting-app-no-debug + +# Prepare Native libs android-arm64-tv-casting-app-no-debug +mkdir -p {root}/examples/tv-casting-app/android/App/app/libs/jniLibs/arm64-v8a + +cp {out}/android-arm64-tv-casting-app-no-debug/lib/jni/arm64-v8a/libc++_shared.so {root}/examples/tv-casting-app/android/App/app/libs/jniLibs/arm64-v8a/libc++_shared.so + +cp {out}/android-arm64-tv-casting-app-no-debug/lib/jni/arm64-v8a/libTvCastingApp.so {root}/examples/tv-casting-app/android/App/app/libs/jniLibs/arm64-v8a/libTvCastingApp.so + +cp {out}/android-arm64-tv-casting-app-no-debug/lib/third_party/connectedhomeip/src/platform/android/AndroidPlatform.jar {root}/examples/tv-casting-app/android/App/app/libs/AndroidPlatform.jar + +cp {out}/android-arm64-tv-casting-app-no-debug/lib/third_party/connectedhomeip/src/app/server/java/CHIPAppServer.jar {root}/examples/tv-casting-app/android/App/app/libs/CHIPAppServer.jar + +cp {out}/android-arm64-tv-casting-app-no-debug/lib/TvCastingApp.jar {root}/examples/tv-casting-app/android/App/app/libs/TvCastingApp.jar + +# Building Example android-arm64-tv-casting-app-no-debug +{root}/examples/tv-casting-app/android/App/gradlew -p {root}/examples/tv-casting-app/android/App/ -PmatterBuildSrcDir={out}/android-arm64-tv-casting-app-no-debug -PmatterSdkSourceBuild=false -PbuildDir={out}/android-arm64-tv-casting-app-no-debug assembleDebug + # Building JNI android-arm64-tv-server ninja -C {out}/android-arm64-tv-server @@ -1456,6 +1574,32 @@ cp {out}/android-arm64-tv-server/lib/TvApp.jar {root}/examples/tv-app/android/Ap # Building Example android-arm64-tv-server, module content-app {root}/examples/tv-app/android/App/gradlew -p {root}/examples/tv-app/android/App/ -PmatterBuildSrcDir={out}/android-arm64-tv-server -PmatterSdkSourceBuild=false -PbuildDir={out}/android-arm64-tv-server/content-app :content-app:assembleDebug +# Building JNI android-arm64-tv-server-no-debug +ninja -C {out}/android-arm64-tv-server-no-debug + +# Prepare Native libs android-arm64-tv-server-no-debug +mkdir -p {root}/examples/tv-app/android/App/app/libs/jniLibs/arm64-v8a + +cp {out}/android-arm64-tv-server-no-debug/lib/jni/arm64-v8a/libSetupPayloadParser.so {root}/examples/tv-app/android/App/app/libs/jniLibs/arm64-v8a/libSetupPayloadParser.so + +cp {out}/android-arm64-tv-server-no-debug/lib/jni/arm64-v8a/libc++_shared.so {root}/examples/tv-app/android/App/app/libs/jniLibs/arm64-v8a/libc++_shared.so + +cp {out}/android-arm64-tv-server-no-debug/lib/jni/arm64-v8a/libTvApp.so {root}/examples/tv-app/android/App/app/libs/jniLibs/arm64-v8a/libTvApp.so + +cp {out}/android-arm64-tv-server-no-debug/lib/third_party/connectedhomeip/src/setup_payload/java/SetupPayloadParser.jar {root}/examples/tv-app/android/App/app/libs/SetupPayloadParser.jar + +cp {out}/android-arm64-tv-server-no-debug/lib/third_party/connectedhomeip/src/platform/android/AndroidPlatform.jar {root}/examples/tv-app/android/App/app/libs/AndroidPlatform.jar + +cp {out}/android-arm64-tv-server-no-debug/lib/third_party/connectedhomeip/src/app/server/java/CHIPAppServer.jar {root}/examples/tv-app/android/App/app/libs/CHIPAppServer.jar + +cp {out}/android-arm64-tv-server-no-debug/lib/TvApp.jar {root}/examples/tv-app/android/App/app/libs/TvApp.jar + +# Building Example android-arm64-tv-server-no-debug, module platform-app +{root}/examples/tv-app/android/App/gradlew -p {root}/examples/tv-app/android/App/ -PmatterBuildSrcDir={out}/android-arm64-tv-server-no-debug -PmatterSdkSourceBuild=false -PbuildDir={out}/android-arm64-tv-server-no-debug/platform-app :platform-app:assembleDebug + +# Building Example android-arm64-tv-server-no-debug, module content-app +{root}/examples/tv-app/android/App/gradlew -p {root}/examples/tv-app/android/App/ -PmatterBuildSrcDir={out}/android-arm64-tv-server-no-debug -PmatterSdkSourceBuild=false -PbuildDir={out}/android-arm64-tv-server-no-debug/content-app :content-app:assembleDebug + # Building JNI android-x64-chip-tool ninja -C {out}/android-x64-chip-tool @@ -1503,6 +1647,32 @@ cp {out}/android-x64-tv-server/lib/TvApp.jar {root}/examples/tv-app/android/App/ # Building Example android-x64-tv-server, module content-app {root}/examples/tv-app/android/App/gradlew -p {root}/examples/tv-app/android/App/ -PmatterBuildSrcDir={out}/android-x64-tv-server -PmatterSdkSourceBuild=false -PbuildDir={out}/android-x64-tv-server/content-app :content-app:assembleDebug +# Building JNI android-x64-tv-server-no-debug +ninja -C {out}/android-x64-tv-server-no-debug + +# Prepare Native libs android-x64-tv-server-no-debug +mkdir -p {root}/examples/tv-app/android/App/app/libs/jniLibs/x86_64 + +cp {out}/android-x64-tv-server-no-debug/lib/jni/x86_64/libSetupPayloadParser.so {root}/examples/tv-app/android/App/app/libs/jniLibs/x86_64/libSetupPayloadParser.so + +cp {out}/android-x64-tv-server-no-debug/lib/jni/x86_64/libc++_shared.so {root}/examples/tv-app/android/App/app/libs/jniLibs/x86_64/libc++_shared.so + +cp {out}/android-x64-tv-server-no-debug/lib/jni/x86_64/libTvApp.so {root}/examples/tv-app/android/App/app/libs/jniLibs/x86_64/libTvApp.so + +cp {out}/android-x64-tv-server-no-debug/lib/third_party/connectedhomeip/src/setup_payload/java/SetupPayloadParser.jar {root}/examples/tv-app/android/App/app/libs/SetupPayloadParser.jar + +cp {out}/android-x64-tv-server-no-debug/lib/third_party/connectedhomeip/src/platform/android/AndroidPlatform.jar {root}/examples/tv-app/android/App/app/libs/AndroidPlatform.jar + +cp {out}/android-x64-tv-server-no-debug/lib/third_party/connectedhomeip/src/app/server/java/CHIPAppServer.jar {root}/examples/tv-app/android/App/app/libs/CHIPAppServer.jar + +cp {out}/android-x64-tv-server-no-debug/lib/TvApp.jar {root}/examples/tv-app/android/App/app/libs/TvApp.jar + +# Building Example android-x64-tv-server-no-debug, module platform-app +{root}/examples/tv-app/android/App/gradlew -p {root}/examples/tv-app/android/App/ -PmatterBuildSrcDir={out}/android-x64-tv-server-no-debug -PmatterSdkSourceBuild=false -PbuildDir={out}/android-x64-tv-server-no-debug/platform-app :platform-app:assembleDebug + +# Building Example android-x64-tv-server-no-debug, module content-app +{root}/examples/tv-app/android/App/gradlew -p {root}/examples/tv-app/android/App/ -PmatterBuildSrcDir={out}/android-x64-tv-server-no-debug -PmatterSdkSourceBuild=false -PbuildDir={out}/android-x64-tv-server-no-debug/content-app :content-app:assembleDebug + # Building JNI android-x86-chip-tool ninja -C {out}/android-x86-chip-tool @@ -1550,6 +1720,32 @@ cp {out}/android-x86-tv-server/lib/TvApp.jar {root}/examples/tv-app/android/App/ # Building Example android-x86-tv-server, module content-app {root}/examples/tv-app/android/App/gradlew -p {root}/examples/tv-app/android/App/ -PmatterBuildSrcDir={out}/android-x86-tv-server -PmatterSdkSourceBuild=false -PbuildDir={out}/android-x86-tv-server/content-app :content-app:assembleDebug +# Building JNI android-x86-tv-server-no-debug +ninja -C {out}/android-x86-tv-server-no-debug + +# Prepare Native libs android-x86-tv-server-no-debug +mkdir -p {root}/examples/tv-app/android/App/app/libs/jniLibs/x86 + +cp {out}/android-x86-tv-server-no-debug/lib/jni/x86/libSetupPayloadParser.so {root}/examples/tv-app/android/App/app/libs/jniLibs/x86/libSetupPayloadParser.so + +cp {out}/android-x86-tv-server-no-debug/lib/jni/x86/libc++_shared.so {root}/examples/tv-app/android/App/app/libs/jniLibs/x86/libc++_shared.so + +cp {out}/android-x86-tv-server-no-debug/lib/jni/x86/libTvApp.so {root}/examples/tv-app/android/App/app/libs/jniLibs/x86/libTvApp.so + +cp {out}/android-x86-tv-server-no-debug/lib/third_party/connectedhomeip/src/setup_payload/java/SetupPayloadParser.jar {root}/examples/tv-app/android/App/app/libs/SetupPayloadParser.jar + +cp {out}/android-x86-tv-server-no-debug/lib/third_party/connectedhomeip/src/platform/android/AndroidPlatform.jar {root}/examples/tv-app/android/App/app/libs/AndroidPlatform.jar + +cp {out}/android-x86-tv-server-no-debug/lib/third_party/connectedhomeip/src/app/server/java/CHIPAppServer.jar {root}/examples/tv-app/android/App/app/libs/CHIPAppServer.jar + +cp {out}/android-x86-tv-server-no-debug/lib/TvApp.jar {root}/examples/tv-app/android/App/app/libs/TvApp.jar + +# Building Example android-x86-tv-server-no-debug, module platform-app +{root}/examples/tv-app/android/App/gradlew -p {root}/examples/tv-app/android/App/ -PmatterBuildSrcDir={out}/android-x86-tv-server-no-debug -PmatterSdkSourceBuild=false -PbuildDir={out}/android-x86-tv-server-no-debug/platform-app :platform-app:assembleDebug + +# Building Example android-x86-tv-server-no-debug, module content-app +{root}/examples/tv-app/android/App/gradlew -p {root}/examples/tv-app/android/App/ -PmatterBuildSrcDir={out}/android-x86-tv-server-no-debug -PmatterSdkSourceBuild=false -PbuildDir={out}/android-x86-tv-server-no-debug/content-app :content-app:assembleDebug + # Building bl602-light ninja -C {out}/bl602-light diff --git a/scripts/build/testdata/glob_star_targets_except_host.txt b/scripts/build/testdata/glob_star_targets_except_host.txt index ecf21d637c058a..5aba30c32774ab 100644 --- a/scripts/build/testdata/glob_star_targets_except_host.txt +++ b/scripts/build/testdata/glob_star_targets_except_host.txt @@ -8,15 +8,21 @@ android-androidstudio-x64-chip-tool android-androidstudio-x86-chip-tool android-arm-chip-tool android-arm-tv-casting-app +android-arm-tv-casting-app-no-debug android-arm-tv-server +android-arm-tv-server-no-debug android-arm64-chip-test android-arm64-chip-tool android-arm64-tv-casting-app +android-arm64-tv-casting-app-no-debug android-arm64-tv-server +android-arm64-tv-server-no-debug android-x64-chip-tool android-x64-tv-server +android-x64-tv-server-no-debug android-x86-chip-tool android-x86-tv-server +android-x86-tv-server-no-debug bl602-light bouffalolab-BL706-IoT-DVK-light bouffalolab-BL706-IoT-DVK-light-rpc diff --git a/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp b/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp index 0fbf143097e1b5..a0ebe4cf691089 100644 --- a/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp +++ b/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp @@ -233,13 +233,6 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback( { SessionHandle handle = commandObj->GetExchangeContext()->GetSessionHandle(); - ChipLogProgress( - NotSpecified, - "emberAfGeneralCommissioningClusterCommissioningCompleteCallback: SessionType: %hhu, SecureSessionType: %hhu, " - "commandObj.FabricIndex: %d, failSafe.fabricIndex: %d", - handle->GetSessionType(), handle->AsSecureSession()->GetSecureSessionType(), commandObj->GetAccessingFabricIndex(), - failSafe.GetFabricIndex()); - // If not a CASE session, or the fabric does not match the fail-safe, // error out. if (handle->GetSessionType() != Session::SessionType::kSecure || diff --git a/src/app/server/Dnssd.cpp b/src/app/server/Dnssd.cpp index 09f24e9b6eb495..4e50467da77a53 100644 --- a/src/app/server/Dnssd.cpp +++ b/src/app/server/Dnssd.cpp @@ -251,7 +251,7 @@ CHIP_ERROR DnssdServer::Advertise(bool commissionableNode, chip::Dnssd::Commissi #if CHIP_ENABLE_ROTATING_DEVICE_ID && defined(CHIP_DEVICE_CONFIG_ROTATING_DEVICE_ID_UNIQUE_ID) char rotatingDeviceIdHexBuffer[RotatingDeviceId::kHexMaxLength]; ReturnErrorOnFailure(GenerateRotatingDeviceId(rotatingDeviceIdHexBuffer, ArraySize(rotatingDeviceIdHexBuffer))); - ChipLogProgress(Discovery, "Advertising rotating device ID (hex): 0x%s", rotatingDeviceIdHexBuffer); + ChipLogProgress(Discovery, "Advertising rotating device ID (hex): %s", rotatingDeviceIdHexBuffer); advertiseParameters.SetRotatingDeviceId(chip::Optional::Value(rotatingDeviceIdHexBuffer)); #endif @@ -428,8 +428,8 @@ CHIP_ERROR DnssdServer::GenerateRotatingDeviceId(char rotatingDeviceIdHexBuffer[ char hexRotatingDeviceIdUniqueId[2 * CHIP_DEVICE_CONFIG_ROTATING_DEVICE_ID_UNIQUE_ID_LENGTH]; Encoding::BytesToUppercaseHexString(rotatingDeviceIdUniqueIdSpan.data(), rotatingDeviceIdUniqueIdSpan.size(), hexRotatingDeviceIdUniqueId, 2 * CHIP_DEVICE_CONFIG_ROTATING_DEVICE_ID_UNIQUE_ID_LENGTH); - ChipLogProgress(Discovery, "Generating rotating device ID based on unique ID (hex): %s with byte size: %zu", - hexRotatingDeviceIdUniqueId, rotatingDeviceIdUniqueIdSpan.size()); + ChipLogProgress(Discovery, "Generating rotating device ID based on unique ID (hex): %s with byte size: %d", + hexRotatingDeviceIdUniqueId, (int)rotatingDeviceIdUniqueIdSpan.size()); return AdditionalDataPayloadGenerator().generateRotatingDeviceIdAsHexString( additionalDataPayloadParams, rotatingDeviceIdHexBuffer, rotatingDeviceIdHexBufferSize, rotatingDeviceIdValueOutputSize); diff --git a/src/lib/dnssd/Resolver.h b/src/lib/dnssd/Resolver.h index 2f9bb34c93f9b2..369e1e68515d00 100644 --- a/src/lib/dnssd/Resolver.h +++ b/src/lib/dnssd/Resolver.h @@ -38,7 +38,12 @@ namespace Dnssd { /// Node resolution data common to both operational and commissionable discovery struct CommonResolutionData { +#ifdef CHIP_DEVICE_CONFIG_MAX_DISCOVERED_IP_ADDRESSES static constexpr unsigned kMaxIPAddresses = CHIP_DEVICE_CONFIG_MAX_DISCOVERED_IP_ADDRESSES; +#else + static constexpr unsigned kMaxIPAddresses = 5; +#endif + Inet::InterfaceId interfaceId;