Skip to content

Commit

Permalink
separate out gn fake platform declaration (#11860)
Browse files Browse the repository at this point in the history
* Remove unused script with duplicate name, fix typo in enable/disable of build.gn

* Include the correct gni to declare chip_fake_platform

* Split out fake platform argument in separate gni that lives under the build system

* Restyle fixes

* Resurrect gn_build.sh: apparently used by CI workflows (and by ripgrep did not show hidden paths

* Switch fake platform into its separate toolchain that is included in the top level gn file (but will not be seen in example apps unless they explicitly ask for it)

* Restyle fixes

* Undo some not needed changes
  • Loading branch information
andy31415 authored and pull[bot] committed Dec 14, 2022
1 parent 1d8d830 commit 1499536
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 13 deletions.
2 changes: 1 addition & 1 deletion BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {

if (enable_fake_tests) {
chip_build("fake_platform") {
toolchain = "${build_root}/toolchain/host:fake_${host_cpu}_gcc"
toolchain = "${build_root}/toolchain/fake:fake_${host_cpu}_gcc"
}
}

Expand Down
27 changes: 27 additions & 0 deletions build/toolchain/fake/BUILD.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Copyright 2020 The Pigweed Authors
# 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.

import("//build_overrides/build.gni")
import("${build_root}/toolchain/gcc_toolchain.gni")

gcc_toolchain("fake_${host_cpu}_gcc") {
toolchain_args = {
current_os = host_os
current_os = host_os
current_cpu = host_cpu
is_clang = false
chip_fake_platform = true
}
}
12 changes: 0 additions & 12 deletions build/toolchain/host/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,3 @@ gcc_toolchain("${host_os}_${host_cpu}_clang") {
is_clang = true
}
}

if (defined(chip_fake_plaform)) {
gcc_toolchain("fake_${host_cpu}_gcc") {
toolchain_args = {
current_os = host_os
current_os = host_os
current_cpu = host_cpu
is_clang = false
chip_fake_platform = true
}
}
}

0 comments on commit 1499536

Please sign in to comment.