commit 09d84aae6c7654e2f13c38a4a65ebef3602eca0c
author Wyatt Hepler <hepler@google.com> Wed Feb 03 14:25:45 2021 -0800
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Feb 16 23:35:54 2021 +0000
tree e2dd06a9cd0be08c907379604f49cd2d95dabe73
parent ac19a474c6ced4ee7fafa6237324c95f6a6413f2

Build: Simplify definition of the docs target

Have the docs group build the docs directly using the docs toolchain,
rather than relying on the pigweed_default group.

Change-Id: I898508ea74758fef72535f060be8c5fffc9d31db
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/31801
Pigweed-Auto-Submit: Wyatt Hepler <hepler@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
Reviewed-by: Alexei Frolov <frolv@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 230eb14..0c1ebdb 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -122,7 +122,7 @@
 }
 
 group("docs") {
-  deps = [ ":pigweed_default($dir_pigweed/targets/docs)" ]
+  deps = [ "$dir_pigweed/docs($dir_pigweed/targets/docs)" ]
 }
 
 # OSS-Fuzz uses this target to build fuzzers alone.
@@ -179,38 +179,34 @@
 
   # Prevent the default toolchain from parsing any other BUILD.gn files.
   if (current_toolchain != default_toolchain) {
-    if (pw_docgen_BUILD_DOCS) {
-      deps += [ "$dir_pigweed/docs" ]
+    deps = [ ":apps" ]
+    if (pw_unit_test_AUTOMATIC_RUNNER == "") {
+      # Without a test runner defined, build the tests but don't run them.
+      deps += [ ":pw_module_tests" ]
     } else {
-      deps += [ ":apps" ]
-      if (pw_unit_test_AUTOMATIC_RUNNER == "") {
-        # Without a test runner defined, build the tests but don't run them.
-        deps += [ ":pw_module_tests" ]
-      } else {
-        # With a test runner, depend on the run targets so they run with the
-        # build.
-        deps += [ ":pw_module_tests.run" ]
-      }
+      # With a test runner, depend on the run targets so they run with the
+      # build.
+      deps += [ ":pw_module_tests.run" ]
     }
-    if (defined(pw_toolchain_SCOPE.is_host_toolchain) &&
-        pw_toolchain_SCOPE.is_host_toolchain && pw_build_HOST_TOOLS) {
-      deps += [ ":host_tools" ]
-    }
+  }
+  if (defined(pw_toolchain_SCOPE.is_host_toolchain) &&
+      pw_toolchain_SCOPE.is_host_toolchain && pw_build_HOST_TOOLS) {
+    deps += [ ":host_tools" ]
+  }
 
-    # Trace examples currently only support running on non-windows host
-    if (defined(pw_toolchain_SCOPE.is_host_toolchain) &&
-        pw_toolchain_SCOPE.is_host_toolchain && host_os != "win") {
-      deps += [
-        "$dir_pw_trace:trace_example_basic",
-        "$dir_pw_trace_tokenized:trace_tokenized_example_basic",
-        "$dir_pw_trace_tokenized:trace_tokenized_example_filter",
-        "$dir_pw_trace_tokenized:trace_tokenized_example_trigger",
-      ]
-    }
+  # Trace examples currently only support running on non-windows host
+  if (defined(pw_toolchain_SCOPE.is_host_toolchain) &&
+      pw_toolchain_SCOPE.is_host_toolchain && host_os != "win") {
+    deps += [
+      "$dir_pw_trace:trace_example_basic",
+      "$dir_pw_trace_tokenized:trace_tokenized_example_basic",
+      "$dir_pw_trace_tokenized:trace_tokenized_example_filter",
+      "$dir_pw_trace_tokenized:trace_tokenized_example_trigger",
+    ]
   }
 }
 
-# Prevent the default toolchain from parsing any other BUILD.gn files.
+# The default toolchain is not used for compiling C/C++ code.
 if (current_toolchain != default_toolchain) {
   group("apps") {
     # Application images built for all targets.