From 95bcd02a07a985d3904342cfee20a27fd086080e Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Mon, 21 Mar 2022 09:10:44 -0400 Subject: [PATCH] Move encode_value and decode_value back into the Darwin framework. (#16417) chip-tool-darwin depending on the framework is fine, but the framework depending on chip-tool-darwin is not really OK. Fixes https://github.com/project-chip/connectedhomeip/issues/16080 --- examples/chip-tool-darwin/templates/templates.json | 4 ++-- .../Framework/CHIP}/templates/partials/decode_value.zapt | 0 .../Framework/CHIP}/templates/partials/encode_value.zapt | 0 src/darwin/Framework/CHIP/templates/templates.json | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) rename {examples/chip-tool-darwin => src/darwin/Framework/CHIP}/templates/partials/decode_value.zapt (100%) rename {examples/chip-tool-darwin => src/darwin/Framework/CHIP}/templates/partials/encode_value.zapt (100%) diff --git a/examples/chip-tool-darwin/templates/templates.json b/examples/chip-tool-darwin/templates/templates.json index cefb80332a2429..d72564165f9a5b 100644 --- a/examples/chip-tool-darwin/templates/templates.json +++ b/examples/chip-tool-darwin/templates/templates.json @@ -32,11 +32,11 @@ }, { "name": "encode_value", - "path": "partials/encode_value.zapt" + "path": "../../../src/darwin/Framework/CHIP/templates/partials/encode_value.zapt" }, { "name": "decode_value", - "path": "partials/decode_value.zapt" + "path": "../../../src/darwin/Framework/CHIP/templates/partials/decode_value.zapt" }, { "name": "test_value", diff --git a/examples/chip-tool-darwin/templates/partials/decode_value.zapt b/src/darwin/Framework/CHIP/templates/partials/decode_value.zapt similarity index 100% rename from examples/chip-tool-darwin/templates/partials/decode_value.zapt rename to src/darwin/Framework/CHIP/templates/partials/decode_value.zapt diff --git a/examples/chip-tool-darwin/templates/partials/encode_value.zapt b/src/darwin/Framework/CHIP/templates/partials/encode_value.zapt similarity index 100% rename from examples/chip-tool-darwin/templates/partials/encode_value.zapt rename to src/darwin/Framework/CHIP/templates/partials/encode_value.zapt diff --git a/src/darwin/Framework/CHIP/templates/templates.json b/src/darwin/Framework/CHIP/templates/templates.json index 558e579e28e24a..c4705ed0667ae4 100644 --- a/src/darwin/Framework/CHIP/templates/templates.json +++ b/src/darwin/Framework/CHIP/templates/templates.json @@ -22,11 +22,11 @@ }, { "name": "encode_value", - "path": "../../../../../examples/chip-tool-darwin/templates/partials/encode_value.zapt" + "path": "partials/encode_value.zapt" }, { "name": "decode_value", - "path": "../../../../../examples/chip-tool-darwin/templates/partials/decode_value.zapt" + "path": "partials/decode_value.zapt" }, { "name": "init_struct_member",