Skip to content

Commit

Permalink
Resolve SDK integration issues for JsonTLV library (#17930)
Browse files Browse the repository at this point in the history
  • Loading branch information
CodeChronos928 authored and pull[bot] committed Sep 22, 2023
1 parent d52f272 commit 1104792
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 3 deletions.
17 changes: 17 additions & 0 deletions build_overrides/jsoncpp.gni
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Copyright (c) 2020 Project CHIP Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

declare_args() {
jsoncpp_root = "//third_party/jsoncpp"
}
17 changes: 17 additions & 0 deletions examples/build_overrides/jsoncpp.gni
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Copyright (c) 2020 Project CHIP Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

declare_args() {
jsoncpp_root = "//third_party/connectedhomeip/third_party/jsoncpp"
}
13 changes: 10 additions & 3 deletions src/lib/support/jsontlv/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,19 @@
# limitations under the License.

import("//build_overrides/chip.gni")
import("//build_overrides/jsoncpp.gni")

config("jsontlv_config") {
cflags = [ "-Wno-implicit-fallthrough" ]
}

static_library("jsontlv") {
sources = [ "TlvJson.cpp" ]

public_configs = [ ":jsontlv_config" ]

public_deps = [
"${chip_root}/src/lib/core",
"${chip_root}/third_party/jsoncpp",
jsoncpp_root,
]

sources = [ "TlvJson.cpp" ]
}

0 comments on commit 1104792

Please sign in to comment.