diff options
| author | Armando Montanez <amontanez@google.com> | 2020-06-09 18:12:12 -0700 |
|---|---|---|
| committer | Wyatt Hepler <hepler@google.com> | 2020-06-16 09:50:59 -0700 |
| commit | fb3d3fba791b5b200293d23f08b778ecae34e02f (patch) | |
| tree | 4974cd6eddbe74ff37f19d8a14b0959a90ef2ebc /targets/docs | |
| parent | edd2f148be609f3938eb5ab95b8738823463f621 (diff) | |
| download | pigweed-fb3d3fba791b5b200293d23f08b778ecae34e02f.tar.gz | |
Don't declare pigweed variables as globals
Require targets to explicitly import pigweed variable definitions. This
moves out some necessary logic from the BUILDCONFIG.gn file.
Change-Id: If9c9fe5a680cc9d897a0e8a55889873be618ed84
Diffstat (limited to 'targets/docs')
| -rw-r--r-- | targets/docs/BUILD.gn | 5 | ||||
| -rw-r--r-- | targets/docs/target_config.gni | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/targets/docs/BUILD.gn b/targets/docs/BUILD.gn index 1c9c16efd..82d2f301f 100644 --- a/targets/docs/BUILD.gn +++ b/targets/docs/BUILD.gn @@ -12,8 +12,11 @@ # License for the specific language governing permissions and limitations under # the License. -import("$dir_pw_docgen/docs.gni") +# gn-format disable +import("//build_overrides/pigweed.gni") +import("$dir_pigweed/legacy_target.gni") +import("$dir_pw_docgen/docs.gni") pw_doc_group("target_docs") { sources = [ "target_docs.rst" ] } diff --git a/targets/docs/target_config.gni b/targets/docs/target_config.gni index e8695327f..24057268c 100644 --- a/targets/docs/target_config.gni +++ b/targets/docs/target_config.gni @@ -12,8 +12,10 @@ # License for the specific language governing permissions and limitations under # the License. -import("$dir_pigweed/pw_vars_default.gni") +# Get location of dir_pigweed. +import("//build_overrides/pigweed.gni") +import("$dir_pigweed/pw_vars_default.gni") _arm_bloaty_config = "$dir_pw_boot_armv7m/bloaty_config.bloaty" # Targets are required to set a default toolchain. Use the Cortex M4 ARM |