project-chip
diff --git a/‎examples/chef/chef.py
+1-1 b/‎examples/chef/chef.py
+1-1
diff --git a/‎src/BUILD.gn
+8-1 b/‎src/BUILD.gn
+8-1
diff --git a/‎src/app/codegen-data-model/BUILD.gn
+1 b/‎src/app/codegen-data-model/BUILD.gn
+1
diff --git a/‎src/app/codegen-data-model/CodegenDataModel.cpp
-7 b/‎src/app/codegen-data-model/CodegenDataModel.cpp
-7
diff --git a/‎src/app/codegen-data-model/CodegenDataModel.h
+1-2 b/‎src/app/codegen-data-model/CodegenDataModel.h
+1-2
@@ -878,7 +878,7 @@ def main() -> int:
                         """))
             if options.do_clean:
                 shell.run_cmd("rm -rf out")
-            shell.run_cmd("gn gen out")
+            shell.run_cmd("gn gen --export-compile-commands out")
             shell.run_cmd("ninja -C out")
 
     #
 
@@ -50,7 +50,6 @@ if (chip_build_tests) {
   chip_test_group("tests") {
     deps = []
     tests = [
-      "${chip_root}/src/app/codegen-data-model/tests",
       "${chip_root}/src/app/data-model-interface/tests",
       "${chip_root}/src/access/tests",
       "${chip_root}/src/crypto/tests",
@@ -82,7 +81,15 @@ if (chip_build_tests) {
 
     if (current_os != "zephyr" && current_os != "mbed" &&
         chip_device_platform != "efr32") {
+      # Avoid these items from "one single binary" test executions. Once tests
+      # are split, we can re-visit this (and likely many others)
+      #
+      # In particular:
+      #   "app/codegen-data-model/tests" contains symbols for ember mocks which
+      #                                  are used by other tests
+
       tests += [
+        "${chip_root}/src/app/codegen-data-model/tests",
         "${chip_root}/src/setup_payload/tests",
         "${chip_root}/src/transport/raw/tests",
       ]
 
@@ -20,6 +20,7 @@ import("//build_overrides/chip.gni")
 #
 # Use `model.gni` to get access to:
 #   CodegenDataModel.cpp
+#   CodegenDataModel_Read.cpp
 #   CodegenDataModel.h
 #
 # The above list of files exists to satisfy the "dependency linter"
 
@@ -231,13 +231,6 @@ bool CodegenDataModel::EmberCommandListIterator::Exists(const CommandId * list,
     return (*mCurrentHint == toCheck);
 }
 
-CHIP_ERROR CodegenDataModel::ReadAttribute(const InteractionModel::ReadAttributeRequest & request,
-                                           InteractionModel::ReadState & state, AttributeValueEncoder & encoder)
-{
-    // TODO: this needs an implementation
-    return CHIP_ERROR_NOT_IMPLEMENTED;
-}
-
 CHIP_ERROR CodegenDataModel::WriteAttribute(const InteractionModel::WriteAttributeRequest & request,
                                             AttributeValueDecoder & decoder)
 {
 
@@ -68,8 +68,7 @@ class CodegenDataModel : public chip::app::InteractionModel::DataModel
     /// Generic model implementations
     CHIP_ERROR Shutdown() override { return CHIP_NO_ERROR; }
 
-    CHIP_ERROR ReadAttribute(const InteractionModel::ReadAttributeRequest & request, InteractionModel::ReadState & state,
-                             AttributeValueEncoder & encoder) override;
+    CHIP_ERROR ReadAttribute(const InteractionModel::ReadAttributeRequest & request, AttributeValueEncoder & encoder) override;
     CHIP_ERROR WriteAttribute(const InteractionModel::WriteAttributeRequest & request, AttributeValueDecoder & decoder) override;
     CHIP_ERROR Invoke(const InteractionModel::InvokeRequest & request, chip::TLV::TLVReader & input_arguments,
                       InteractionModel::InvokeReply & reply) override;
Original file line number	Diff line number	Diff line change
`@@ -878,7 +878,7 @@ def main() -> int:`
`878`	`878`	`"""))`
`879`	`879`	`if options.do_clean:`
`880`	`880`	`shell.run_cmd("rm -rf out")`
`881`		`- shell.run_cmd("gn gen out")`
	`881`	`+ shell.run_cmd("gn gen --export-compile-commands out")`
`882`	`882`	`shell.run_cmd("ninja -C out")`
`883`	`883`
`884`	`884`	`#`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ import("//build_overrides/chip.gni")`
`20`	`20`	`#`
`21`	`21`	# Use `model.gni` to get access to:
`22`	`22`	`# CodegenDataModel.cpp`
	`23`	`+# CodegenDataModel_Read.cpp`
`23`	`24`	`# CodegenDataModel.h`
`24`	`25`	`#`
`25`	`26`	`# The above list of files exists to satisfy the "dependency linter"`
Original file line number	Diff line number	Diff line change
`@@ -231,13 +231,6 @@ bool CodegenDataModel::EmberCommandListIterator::Exists(const CommandId * list,`
`231`	`231`	`return (*mCurrentHint == toCheck);`
`232`	`232`	`}`
`233`	`233`
`234`		`-CHIP_ERROR CodegenDataModel::ReadAttribute(const InteractionModel::ReadAttributeRequest & request,`
`235`		`- InteractionModel::ReadState & state, AttributeValueEncoder & encoder)`
`236`		`-{`
`237`		`- // TODO: this needs an implementation`
`238`		`- return CHIP_ERROR_NOT_IMPLEMENTED;`
`239`		`-}`
`240`		`-`
`241`	`234`	`CHIP_ERROR CodegenDataModel::WriteAttribute(const InteractionModel::WriteAttributeRequest & request,`
`242`	`235`	`AttributeValueDecoder & decoder)`
`243`	`236`	`{`