diff --git a/src/controller/data_model/BUILD.gn b/src/controller/data_model/BUILD.gn
index 3a2f40e4961e9d..505a74d0ef6bae 100644
--- a/src/controller/data_model/BUILD.gn
+++ b/src/controller/data_model/BUILD.gn
@@ -174,6 +174,78 @@ if (current_os == "android" || build_java_matter_controller) {
       "jni/ElectricalMeasurementClient-InvokeSubscribeImpl.cpp",
       "jni/UnitTestingClient-ReadImpl.cpp",
       "jni/UnitTestingClient-InvokeSubscribeImpl.cpp",
+      "jni/BromateMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/BromateMeasurementClient-ReadImpl.cpp",
+      "jni/BromodichloromethaneMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/BromodichloromethaneMeasurementClient-ReadImpl.cpp",
+      "jni/BromoformMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/BromoformMeasurementClient-ReadImpl.cpp",
+      "jni/CarbonDioxideMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/CarbonDioxideMeasurementClient-ReadImpl.cpp",
+      "jni/CarbonMonoxideMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/CarbonMonoxideMeasurementClient-ReadImpl.cpp",
+      "jni/ChloraminesMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/ChloraminesMeasurementClient-ReadImpl.cpp",
+      "jni/ChlorineMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/ChlorineMeasurementClient-ReadImpl.cpp",
+      "jni/ChlorodibromomethaneMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/ChlorodibromomethaneMeasurementClient-ReadImpl.cpp",
+      "jni/ChloroformMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/ChloroformMeasurementClient-ReadImpl.cpp",
+      "jni/CopperMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/CopperMeasurementClient-ReadImpl.cpp",
+      "jni/DissolvedOxygenMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/DissolvedOxygenMeasurementClient-ReadImpl.cpp",
+      "jni/EthyleneMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/EthyleneMeasurementClient-ReadImpl.cpp",
+      "jni/EthyleneOxideMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/EthyleneOxideMeasurementClient-ReadImpl.cpp",
+      "jni/FecalColiformEColiMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/FecalColiformEColiMeasurementClient-ReadImpl.cpp",
+      "jni/FluorideMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/FluorideMeasurementClient-ReadImpl.cpp",
+      "jni/FormaldehydeMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/FormaldehydeMeasurementClient-ReadImpl.cpp",
+      "jni/HaloaceticAcidsMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/HaloaceticAcidsMeasurementClient-ReadImpl.cpp",
+      "jni/HydrogenMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/HydrogenMeasurementClient-ReadImpl.cpp",
+      "jni/HydrogenSulfideMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/HydrogenSulfideMeasurementClient-ReadImpl.cpp",
+      "jni/LeadMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/LeadMeasurementClient-ReadImpl.cpp",
+      "jni/ManganeseMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/ManganeseMeasurementClient-ReadImpl.cpp",
+      "jni/NitricOxideMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/NitricOxideMeasurementClient-ReadImpl.cpp",
+      "jni/NitrogenDioxideMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/NitrogenDioxideMeasurementClient-ReadImpl.cpp",
+      "jni/OxygenMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/OxygenMeasurementClient-ReadImpl.cpp",
+      "jni/OzoneMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/OzoneMeasurementClient-ReadImpl.cpp",
+      "jni/Pm10MeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/Pm10MeasurementClient-ReadImpl.cpp",
+      "jni/Pm1MeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/Pm1MeasurementClient-ReadImpl.cpp",
+      "jni/Pm25MeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/Pm25MeasurementClient-ReadImpl.cpp",
+      "jni/RadonMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/RadonMeasurementClient-ReadImpl.cpp",
+      "jni/SodiumMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/SodiumMeasurementClient-ReadImpl.cpp",
+      "jni/SulfateMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/SulfateMeasurementClient-ReadImpl.cpp",
+      "jni/SulfurDioxideMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/SulfurDioxideMeasurementClient-ReadImpl.cpp",
+      "jni/TotalColiformBacteriaMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/TotalColiformBacteriaMeasurementClient-ReadImpl.cpp",
+      "jni/TotalTrihalomethanesMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/TotalTrihalomethanesMeasurementClient-ReadImpl.cpp",
+      "jni/TotalVolatileOrganicCompoundsMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/TotalVolatileOrganicCompoundsMeasurementClient-ReadImpl.cpp",
+      "jni/TurbidityMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/TurbidityMeasurementClient-ReadImpl.cpp",
 
       # Disable CM cluster table tests until update is done
       # https://github.com/project-chip/connectedhomeip/issues/24425