Skip to content

Commit

Permalink
Restyled by gn
Browse files Browse the repository at this point in the history
  • Loading branch information
restyled-commits authored and e-rk committed Aug 26, 2020
1 parent f33f5e2 commit cf11f7b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
6 changes: 2 additions & 4 deletions config/nrfconnect/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import("//build_overrides/chip.gni")
import("//${chip_root}/gn/chip/tests.gni")
import("//build_overrides/chip.gni")

import("//${chip_root}/gn/chip/tests.gni")

assert(current_os == "zephyr")

group("nrfconnect") {
deps = [
"${chip_root}/src/lib",
]
deps = [ "${chip_root}/src/lib" ]
}

if (chip_build_tests) {
Expand Down
2 changes: 1 addition & 1 deletion config/nrfconnect/toolchain/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import("//build_overrides/chip.gni")
import("//build/toolchain/arm_gcc/arm_toolchain.gni")
import("//build_overrides/chip.gni")

import("//build/toolchain/arm_gcc/arm_toolchain.gni")

Expand Down
3 changes: 2 additions & 1 deletion src/crypto/crypto.gni
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ declare_args() {
}

if (chip_crypto == "") {
if (current_os == "android" || current_os == "freertos" || current_os == "zephyr") {
if (current_os == "android" || current_os == "freertos" ||
current_os == "zephyr") {
chip_crypto = "mbedtls"
} else {
chip_crypto = "openssl"
Expand Down
11 changes: 6 additions & 5 deletions src/platform/device.gni
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,9 @@ if (_chip_device_layer != "none" && chip_device_platform != "external") {
"<platform/" + _chip_device_layer + "/SystemPlatformConfig.h>"
}

assert((current_os != "freertos" && chip_device_platform == "none") ||
chip_device_platform == "darwin" || chip_device_platform == "efr32" ||
chip_device_platform == "external" || chip_device_platform == "linux" ||
chip_device_platform == "nrf5" || chip_device_platform == "nrfconnect",
"Please select a valid value for chip_device_platform")
assert(
(current_os != "freertos" && chip_device_platform == "none") ||
chip_device_platform == "darwin" || chip_device_platform == "efr32" ||
chip_device_platform == "external" || chip_device_platform == "linux" ||
chip_device_platform == "nrf5" || chip_device_platform == "nrfconnect",
"Please select a valid value for chip_device_platform")

0 comments on commit cf11f7b

Please sign in to comment.