Remove some stale defines from config files. (#36316)
* Remove some stale defines from config files.
These macros don't configure anything anymore.
* Apply suggestion from code review.
* Remove more whitespace.
diff --git a/config/android/CHIPProjectConfig.h b/config/android/CHIPProjectConfig.h
index 5b55f3b..fd8c7ab 100644
--- a/config/android/CHIPProjectConfig.h
+++ b/config/android/CHIPProjectConfig.h
@@ -26,18 +26,11 @@
#ifndef CHIPPROJECTCONFIG_H
#define CHIPPROJECTCONFIG_H
-// Enable UDP listening on demand in the CHIPDeviceController
-#define CHIP_CONFIG_DEVICE_CONTROLLER_DEMAND_ENABLE_UDP 1
-
#define INET_CONFIG_OVERRIDE_SYSTEM_TCP_USER_TIMEOUT 0
// Uncomment this for a large Tunnel MTU.
-//#define CHIP_CONFIG_TUNNEL_INTERFACE_MTU (9000)
+// #define CHIP_CONFIG_TUNNEL_INTERFACE_MTU (9000)
#define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 300
-#define CHIP_CONFIG_DATA_MANAGEMENT_CLIENT_EXPERIMENTAL 1
-
-#define CHIP_CONFIG_MAX_SOFTWARE_VERSION_LENGTH 128
-
#endif /* CHIPPROJECTCONFIG_H */
diff --git a/config/python/CHIPProjectConfig.h b/config/python/CHIPProjectConfig.h
index 4412c5b..d8960f6 100644
--- a/config/python/CHIPProjectConfig.h
+++ b/config/python/CHIPProjectConfig.h
@@ -59,8 +59,6 @@
#define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 0
-#define CHIP_CONFIG_DATA_MANAGEMENT_CLIENT_EXPERIMENTAL 1
-
/* TODO: Ideally, these #defines should be enabled by default for Linux
AND the python tool would provide runtime options to enable/disable them */
#define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY 1
diff --git a/config/standalone/CHIPProjectConfig.h b/config/standalone/CHIPProjectConfig.h
index 27abcbb..3e91ea4 100644
--- a/config/standalone/CHIPProjectConfig.h
+++ b/config/standalone/CHIPProjectConfig.h
@@ -60,8 +60,6 @@
#define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 0
-#define CHIP_CONFIG_DATA_MANAGEMENT_CLIENT_EXPERIMENTAL 1
-
#ifndef CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT
#define CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT 4
#endif
diff --git a/examples/chip-tool/include/CHIPProjectAppConfig.h b/examples/chip-tool/include/CHIPProjectAppConfig.h
index 8c964bf..d8ad2df 100644
--- a/examples/chip-tool/include/CHIPProjectAppConfig.h
+++ b/examples/chip-tool/include/CHIPProjectAppConfig.h
@@ -54,8 +54,6 @@
#define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 0
-#define CHIP_CONFIG_DATA_MANAGEMENT_CLIENT_EXPERIMENTAL 1
-
#define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY 1
// Enable some test-only interaction model APIs.
diff --git a/examples/fabric-admin/include/CHIPProjectAppConfig.h b/examples/fabric-admin/include/CHIPProjectAppConfig.h
index b3f85d6..441ecd7 100644
--- a/examples/fabric-admin/include/CHIPProjectAppConfig.h
+++ b/examples/fabric-admin/include/CHIPProjectAppConfig.h
@@ -54,8 +54,6 @@
#define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 0
-#define CHIP_CONFIG_DATA_MANAGEMENT_CLIENT_EXPERIMENTAL 1
-
#define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY 1
// Enable some test-only interaction model APIs.
diff --git a/examples/java-matter-controller/include/CHIPProjectAppConfig.h b/examples/java-matter-controller/include/CHIPProjectAppConfig.h
index 09183cc..951b79d 100644
--- a/examples/java-matter-controller/include/CHIPProjectAppConfig.h
+++ b/examples/java-matter-controller/include/CHIPProjectAppConfig.h
@@ -46,8 +46,6 @@
#define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 0
-#define CHIP_CONFIG_DATA_MANAGEMENT_CLIENT_EXPERIMENTAL 1
-
#define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY 1
// Enable some test-only interaction model APIs.
diff --git a/examples/kotlin-matter-controller/include/CHIPProjectAppConfig.h b/examples/kotlin-matter-controller/include/CHIPProjectAppConfig.h
index 09183cc..951b79d 100644
--- a/examples/kotlin-matter-controller/include/CHIPProjectAppConfig.h
+++ b/examples/kotlin-matter-controller/include/CHIPProjectAppConfig.h
@@ -46,8 +46,6 @@
#define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 0
-#define CHIP_CONFIG_DATA_MANAGEMENT_CLIENT_EXPERIMENTAL 1
-
#define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY 1
// Enable some test-only interaction model APIs.
diff --git a/examples/lit-icd-app/linux/config/CHIPProjectConfig.h b/examples/lit-icd-app/linux/config/CHIPProjectConfig.h
index fd663ff..2de4d03 100644
--- a/examples/lit-icd-app/linux/config/CHIPProjectConfig.h
+++ b/examples/lit-icd-app/linux/config/CHIPProjectConfig.h
@@ -63,8 +63,6 @@
#define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 0
-#define CHIP_CONFIG_DATA_MANAGEMENT_CLIENT_EXPERIMENTAL 1
-
#ifndef CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT
#define CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT 4
#endif
