diff --git a/scripts/examples/android_app.sh b/scripts/examples/android_app.sh
index c512d262f885cb..e716fe75c21332 100755
--- a/scripts/examples/android_app.sh
+++ b/scripts/examples/android_app.sh
@@ -16,6 +16,7 @@
 #    limitations under the License.
 #
 
+set -e
 set -x
 env
 
@@ -37,7 +38,7 @@ fi
 # Build shared CHIP libs
 source scripts/activate.sh
 gn gen --check --fail-on-unused-args out/"android_$TARGET_CPU" --args="target_os=\"android\" target_cpu=\"$TARGET_CPU\" android_ndk_root=\"$ANDROID_NDK_HOME\" android_sdk_root=\"$ANDROID_HOME\""
-ninja -C out/"android_$TARGET_CPU" src/setup_payload/java src/controller/java
+ninja -C out/"android_$TARGET_CPU" src/setup_payload/java src/controller/java default
 
 rsync -a out/"android_$TARGET_CPU"/lib/*.jar src/android/CHIPTool/app/libs
 rsync -a out/"android_$TARGET_CPU"/lib/jni/* src/android/CHIPTool/app/src/main/jniLibs
diff --git a/src/BUILD.gn b/src/BUILD.gn
index e3bc3aa7aa8950..00566547696b6e 100644
--- a/src/BUILD.gn
+++ b/src/BUILD.gn
@@ -41,7 +41,6 @@ if (chip_build_tests) {
       "${chip_root}/src/app/tests",
       "${chip_root}/src/crypto/tests",
       "${chip_root}/src/inet/tests",
-      "${chip_root}/src/lib/mdns/minimal/tests",
       "${chip_root}/src/messaging/tests",
       "${chip_root}/src/protocols/bdx/tests",
       "${chip_root}/src/system/tests",
@@ -50,6 +49,10 @@ if (chip_build_tests) {
       "${chip_root}/src/transport/tests",
     ]
 
+    if (chip_device_platform != "none") {
+      deps += [ "${chip_root}/src/lib/mdns/minimal/tests" ]
+    }
+
     if (chip_device_platform != "esp32") {
       deps += [
         "${chip_root}/src/lib/asn1/tests",