Remove znet-bookkeeping.[h|c] files (#3607)

project-chip · Nov 4, 2020 · ceecd84 · ceecd84
1 parent ad8bd67
commit ceecd84
Show file tree

Hide file tree

Showing 29 changed files with 12 additions and 1,175 deletions.
diff --git a/examples/common/chip-app-server/BUILD.gn b/examples/common/chip-app-server/BUILD.gn
@@ -29,7 +29,8 @@ declare_args() {
 static_library("chip-app-server") {
   output_name = "chip-app-server"
 
-  # DataModelHandler.cpp includes a generated header (gen/znet-bookkeeping.h),
+  # Issue #1630
+  # DataModelHandler.cpp includes files that relies on generated headers
   # so we can't compile it into this static library.  It needs to be compiled
   # directly by someone who knows where the generated files for the app we're
   # compiling live.

diff --git a/examples/common/chip-app-server/DataModelHandler.cpp b/examples/common/chip-app-server/DataModelHandler.cpp
@@ -26,7 +26,6 @@
 
 #include "DataModelHandler.h"
 
-#include "gen/znet-bookkeeping.h"
 #include <app/chip-zcl-zpro-codec.h>
 #include <app/util/af-types.h>
 #include <app/util/attribute-storage.h>
@@ -80,6 +79,6 @@ void HandleDataModelMessage(const PacketHeader & header, System::PacketBuffer *
 void InitDataModelHandler()
 {
     emberAfEndpointConfigure();
-    emAfInit();
+    emberAfInit();
 }
 }
diff --git a/examples/lighting-app/efr32/BUILD.gn b/examples/lighting-app/efr32/BUILD.gn
@@ -112,7 +112,6 @@ efr32_executable("lighting_app") {
     "src/ZclCallbacks.cpp",
     "src/gen/call-command-handler.c",
     "src/gen/callback-stub.c",
-    "src/gen/znet-bookkeeping.c",
     "src/main.cpp",
   ]
 

diff --git a/examples/lighting-app/efr32/src/gen/znet-bookkeeping.c b/examples/lighting-app/efr32/src/gen/znet-bookkeeping.c
diff --git a/examples/lighting-app/efr32/src/gen/znet-bookkeeping.h b/examples/lighting-app/efr32/src/gen/znet-bookkeeping.h
diff --git a/examples/lighting-app/lighting-common/BUILD.gn b/examples/lighting-app/lighting-common/BUILD.gn
@@ -40,7 +40,6 @@ source_set("lighting-common") {
     "${chip_root}/src/app/util/util.cpp",
     "gen/call-command-handler.c",
     "gen/callback-stub.c",
-    "gen/znet-bookkeeping.c",
   ]
 
   deps = [

diff --git a/examples/lighting-app/lighting-common/gen/znet-bookkeeping.c b/examples/lighting-app/lighting-common/gen/znet-bookkeeping.c