commit ec4aebb26276f7743985b35e294a287933f4d38b
author Armando Montanez <amontanez@google.com> Wed Nov 11 18:43:26 2020 -0800
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Nov 12 19:11:33 2020 +0000
tree d2c900ad6f123a590b520bbd4c608607d0fbc251
parent 7cd6f08474d1896e51db851444ce75c1f2676b34

Clean up root python groups

Since the default toolchain now supports copying, python targets/groups
don't need to explicitly specify a toolchain.

Change-Id: Ie0d28d03d12e59c37f48d0f4e6f33a723fb6967b
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/24442
Pigweed-Auto-Submit: Armando Montanez <amontanez@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
Reviewed-by: Wyatt Hepler <hepler@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index e229a28..400aac6 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -43,7 +43,11 @@
   deps = [
     ":docs",
     ":host",
+    ":python.lint",
+    ":python.tests",
     ":stm32f429i",
+    ":target_support_packages.lint",
+    ":target_support_packages.tests",
   ]
 }
 
@@ -114,7 +118,7 @@
 }
 
 pw_python_group("python") {
-  _python_gn_targets = [
+  python_deps = [
     # Python packages
     "$dir_pw_allocator/py",
     "$dir_pw_arduino_build/py",
@@ -128,8 +132,8 @@
     "$dir_pw_module/py",
     "$dir_pw_package/py",
     "$dir_pw_presubmit/py",
-    "$dir_pw_protobuf_compiler/py",
     "$dir_pw_protobuf/py",
+    "$dir_pw_protobuf_compiler/py",
     "$dir_pw_rpc/py",
     "$dir_pw_status/py",
     "$dir_pw_tokenizer/py",
@@ -141,20 +145,13 @@
     # Standalone scripts
     "$dir_pw_hdlc_lite/rpc_example:example_script",
   ]
-
-  _py_toolchain = "$_default_toolchain_prefix$pw_default_optimization_level"
-
-  python_deps = []
-  foreach(dep, _python_gn_targets) {
-    python_deps += [ "$dep($_py_toolchain)" ]
-  }
 }
 
 # Python packages for supporting specific targets.
 pw_python_group("target_support_packages") {
   python_deps = [
-    "$dir_pigweed/targets/lm3s6965evb-qemu/py($dir_pigweed/targets/lm3s6965evb-qemu:lm3s6965evb_qemu_$pw_default_optimization_level)",
-    "$dir_pigweed/targets/stm32f429i-disc1/py($dir_pigweed/targets/stm32f429i-disc1:stm32f429i_disc1_$pw_default_optimization_level)",
+    "$dir_pigweed/targets/lm3s6965evb-qemu/py",
+    "$dir_pigweed/targets/stm32f429i-disc1/py",
   ]
 }
 
@@ -167,13 +164,7 @@
     if (pw_docgen_BUILD_DOCS) {
       deps += [ "$dir_pigweed/docs" ]
     } else {
-      deps += [
-        ":apps",
-        ":python.lint",
-        ":python.tests",
-        ":target_support_packages.lint",
-        ":target_support_packages.tests",
-      ]
+      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" ]