Move //gn/* to //* (project-chip#3070)

* Move //gn/* to //* This avoids needing to use the secondary_source path remapping which can cause confusion as the contents of //gn are all named without saying "//gn". By convention, the build system shared files are placed at //build and non-shares files are //build_overrides. This allows drop the CHIP build into other projects as a submodule, as long as they follow the same conventions. * Fix labeler
mkardous-silabs · Oct 7, 2020 · 55d6a5f · 55d6a5f
1 parent 1758d43
commit 55d6a5f
Show file tree

Hide file tree

Showing 114 changed files with 81 additions and 100 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -45,8 +45,9 @@ vscode:
     - .devcontainer
 
 gn:
-    - gn/*
-    - .gn/*
+    - build/*
+    - build_overrides/*
+    - .gn
     - "*.gn"
     - "*.gni"
 

diff --git a/.gn b/.gn
@@ -18,10 +18,7 @@ buildconfig = "//build/config/BUILDCONFIG.gn"
 # CHIP uses angle bracket includes.
 check_system_includes = true
 
-# Allow loading paths relative to //gn.
-secondary_source = "//gn/"
-
-import("//gn/build_overrides/pigweed.gni")
+import("//build_overrides/pigweed.gni")
 
 script_executable = "python3"
 

diff --git a/BUILD.gn b/BUILD.gn
@@ -22,8 +22,8 @@ import("//build_overrides/pigweed.gni")
 # This build file should not be used in superproject builds.
 assert(chip_root == "//")
 
-import("${chip_root}/gn/chip/tests.gni")
-import("${chip_root}/gn/chip/tools.gni")
+import("${chip_root}/build/chip/tests.gni")
+import("${chip_root}/build/chip/tools.gni")
 
 if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
   declare_args() {
@@ -91,7 +91,7 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
   }
 } else {
   # This is the unified build. Configure various real toolchains.
-  import("${chip_root}/gn/chip/chip_build.gni")
+  import("${chip_root}/build/chip/chip_build.gni")
   declare_args() {
     # Set this to false to disable all builds by default.
     enable_default_builds = true

diff --git a/gn/chip/buildconfig_header.gni → build/chip/buildconfig_header.gni b/gn/chip/buildconfig_header.gni → build/chip/buildconfig_header.gni
@@ -108,7 +108,7 @@ template("buildconfig_header") {
   gen_target_name = "gen_${target_name}"
 
   action(gen_target_name) {
-    script = "${chip_root}/gn/chip/write_buildconfig_header.py"
+    script = "${chip_root}/build/chip/write_buildconfig_header.py"
 
     if (defined(invoker.header_dir)) {
       header_file = "${invoker.header_dir}/${invoker.header}"

diff --git a/gn/chip/chip_build.gni → build/chip/chip_build.gni b/gn/chip/chip_build.gni → build/chip/chip_build.gni
@@ -14,7 +14,7 @@
 
 import("//build_overrides/chip.gni")
 
-import("${chip_root}/gn/chip/tests.gni")
+import("${chip_root}/build/chip/tests.gni")
 
 template("chip_build") {
   _build_name = target_name

diff --git a/gn/chip/chip_test.gni → build/chip/chip_test.gni b/gn/chip/chip_test.gni → build/chip/chip_test.gni
@@ -15,7 +15,7 @@
 import("//build_overrides/chip.gni")
 import("//build_overrides/pigweed.gni")
 
-import("${chip_root}/gn/chip/tests.gni")
+import("${chip_root}/build/chip/tests.gni")
 import("${chip_root}/src/platform/device.gni")
 import("${dir_pw_unit_test}/test.gni")
 

diff --git a/gn/chip/chip_test_group.gni → build/chip/chip_test_group.gni b/gn/chip/chip_test_group.gni → build/chip/chip_test_group.gni
@@ -14,7 +14,7 @@
 
 import("//build_overrides/chip.gni")
 
-import("${chip_root}/gn/chip/tests.gni")
+import("${chip_root}/build/chip/tests.gni")
 
 assert(chip_build_tests)
 

diff --git a/gn/chip/chip_test_suite.gni → build/chip/chip_test_suite.gni b/gn/chip/chip_test_suite.gni → build/chip/chip_test_suite.gni
@@ -14,8 +14,8 @@
 
 import("//build_overrides/chip.gni")
 
-import("${chip_root}/gn/chip/chip_test.gni")
-import("${chip_root}/gn/chip/tests.gni")
+import("${chip_root}/build/chip/chip_test.gni")
+import("${chip_root}/build/chip/tests.gni")
 import("${dir_pw_unit_test}/test.gni")
 
 assert(chip_build_tests)

diff --git a/gn/chip/chip_version.gni → build/chip/chip_version.gni b/gn/chip/chip_version.gni → build/chip/chip_version.gni
diff --git a/gn/chip/java/jar_runner.py → build/chip/java/jar_runner.py b/gn/chip/java/jar_runner.py → build/chip/java/jar_runner.py
diff --git a/gn/chip/java/javac_runner.py → build/chip/java/javac_runner.py b/gn/chip/java/javac_runner.py → build/chip/java/javac_runner.py
diff --git a/gn/chip/java/rules.gni → build/chip/java/rules.gni b/gn/chip/java/rules.gni → build/chip/java/rules.gni
@@ -12,10 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import("//build_overrides/chip.gni")
+
 import("//build/config/android/config.gni")
 
-javac_runner = "//gn/chip/java/javac_runner.py"
-jar_runner = "//gn/chip/java/jar_runner.py"
+javac_runner = "${chip_root}/build/chip/java/javac_runner.py"
+jar_runner = "${chip_root}/build/chip/java/jar_runner.py"
 
 assert(android_sdk_root != "", "android_sdk_root must be specified")
 

diff --git a/gn/chip/linux/BUILD.gn → build/chip/linux/BUILD.gn b/gn/chip/linux/BUILD.gn → build/chip/linux/BUILD.gn
diff --git a/gn/chip/linux/gdbus_library.gni → build/chip/linux/gdbus_library.gni b/gn/chip/linux/gdbus_library.gni → build/chip/linux/gdbus_library.gni
diff --git a/gn/chip/linux/gen_gdbus_wrapper.py → build/chip/linux/gen_gdbus_wrapper.py b/gn/chip/linux/gen_gdbus_wrapper.py → build/chip/linux/gen_gdbus_wrapper.py
diff --git a/gn/chip/python_gen_tags.py → build/chip/python_gen_tags.py b/gn/chip/python_gen_tags.py → build/chip/python_gen_tags.py
diff --git a/gn/chip/tests.gni → build/chip/tests.gni b/gn/chip/tests.gni → build/chip/tests.gni
diff --git a/gn/chip/tools.gni → build/chip/tools.gni b/gn/chip/tools.gni → build/chip/tools.gni
diff --git a/gn/chip/write_buildconfig_header.py → build/chip/write_buildconfig_header.py b/gn/chip/write_buildconfig_header.py → build/chip/write_buildconfig_header.py
diff --git a/gn/build/config/BUILDCONFIG.gn → build/config/BUILDCONFIG.gn b/gn/build/config/BUILDCONFIG.gn → build/config/BUILDCONFIG.gn
diff --git a/gn/build/config/android/config.gni → build/config/android/config.gni b/gn/build/config/android/config.gni → build/config/android/config.gni
diff --git a/gn/build/config/android_abi.gni → build/config/android_abi.gni b/gn/build/config/android_abi.gni → build/config/android_abi.gni
diff --git a/gn/build/config/arm.gni → build/config/arm.gni b/gn/build/config/arm.gni → build/config/arm.gni
diff --git a/gn/build/config/compiler/BUILD.gn → build/config/compiler/BUILD.gn b/gn/build/config/compiler/BUILD.gn → build/config/compiler/BUILD.gn
diff --git a/gn/build/config/compiler/compiler.gni → build/config/compiler/compiler.gni b/gn/build/config/compiler/compiler.gni → build/config/compiler/compiler.gni
diff --git a/gn/build/config/custom_toolchain.gni → build/config/custom_toolchain.gni b/gn/build/config/custom_toolchain.gni → build/config/custom_toolchain.gni
diff --git a/gn/build/config/defaults.gni → build/config/defaults.gni b/gn/build/config/defaults.gni → build/config/defaults.gni
diff --git a/gn/build/config/linux/pkg-config.py → build/config/linux/pkg-config.py b/gn/build/config/linux/pkg-config.py → build/config/linux/pkg-config.py
diff --git a/gn/build/config/linux/pkg_config.gni → build/config/linux/pkg_config.gni b/gn/build/config/linux/pkg_config.gni → build/config/linux/pkg_config.gni
diff --git a/gn/build/config/target.gni → build/config/target.gni b/gn/build/config/target.gni → build/config/target.gni
diff --git a/gn/build/config/x86.gni → build/config/x86.gni b/gn/build/config/x86.gni → build/config/x86.gni
diff --git a/gn/build/gn_run_binary.py → build/gn_run_binary.py b/gn/build/gn_run_binary.py → build/gn_run_binary.py
diff --git a/gn/build/toolchain/android/BUILD.gn → build/toolchain/android/BUILD.gn b/gn/build/toolchain/android/BUILD.gn → build/toolchain/android/BUILD.gn
diff --git a/gn/build/toolchain/android/android_arm.gni → build/toolchain/android/android_arm.gni b/gn/build/toolchain/android/android_arm.gni → build/toolchain/android/android_arm.gni
diff --git a/...d/toolchain/android/android_toolchain.gni → ...d/toolchain/android/android_toolchain.gni b/...d/toolchain/android/android_toolchain.gni → ...d/toolchain/android/android_toolchain.gni
diff --git a/gn/build/toolchain/arm_gcc/BUILD.gn → build/toolchain/arm_gcc/BUILD.gn b/gn/build/toolchain/arm_gcc/BUILD.gn → build/toolchain/arm_gcc/BUILD.gn
diff --git a/gn/build/toolchain/arm_gcc/arm_toolchain.gni → build/toolchain/arm_gcc/arm_toolchain.gni b/gn/build/toolchain/arm_gcc/arm_toolchain.gni → build/toolchain/arm_gcc/arm_toolchain.gni
diff --git a/gn/build/toolchain/flashable_executable.gni → build/toolchain/flashable_executable.gni b/gn/build/toolchain/flashable_executable.gni → build/toolchain/flashable_executable.gni
@@ -37,7 +37,7 @@ template("objcopy_convert") {
       rebase_path(conversion_input, root_build_dir),
       rebase_path(conversion_output, root_build_dir),
     ]
-    script = "${chip_root}/gn/build/gn_run_binary.py"
+    script = "//build/gn_run_binary.py"
   }
 }
 

diff --git a/gn/build/toolchain/gcc_toolchain.gni → build/toolchain/gcc_toolchain.gni b/gn/build/toolchain/gcc_toolchain.gni → build/toolchain/gcc_toolchain.gni
diff --git a/gn/build/toolchain/host/BUILD.gn → build/toolchain/host/BUILD.gn b/gn/build/toolchain/host/BUILD.gn → build/toolchain/host/BUILD.gn
diff --git a/gn/build/toolchain/ios/BUILD.gn → build/toolchain/ios/BUILD.gn b/gn/build/toolchain/ios/BUILD.gn → build/toolchain/ios/BUILD.gn
diff --git a/gn/build_overrides/chip.gni → build_overrides/chip.gni b/gn/build_overrides/chip.gni → build_overrides/chip.gni
diff --git a/gn/build_overrides/efr32_sdk.gni → build_overrides/efr32_sdk.gni b/gn/build_overrides/efr32_sdk.gni → build_overrides/efr32_sdk.gni
diff --git a/gn/build_overrides/esp32.gni → build_overrides/esp32.gni b/gn/build_overrides/esp32.gni → build_overrides/esp32.gni
diff --git a/gn/build_overrides/jlink.gni → build_overrides/jlink.gni b/gn/build_overrides/jlink.gni → build_overrides/jlink.gni
diff --git a/gn/build_overrides/lwip.gni → build_overrides/lwip.gni b/gn/build_overrides/lwip.gni → build_overrides/lwip.gni
diff --git a/gn/build_overrides/mbedtls.gni → build_overrides/mbedtls.gni b/gn/build_overrides/mbedtls.gni → build_overrides/mbedtls.gni
diff --git a/gn/build_overrides/nlassert.gni → build_overrides/nlassert.gni b/gn/build_overrides/nlassert.gni → build_overrides/nlassert.gni
diff --git a/gn/build_overrides/nlfaultinjection.gni → build_overrides/nlfaultinjection.gni b/gn/build_overrides/nlfaultinjection.gni → build_overrides/nlfaultinjection.gni
diff --git a/gn/build_overrides/nlio.gni → build_overrides/nlio.gni b/gn/build_overrides/nlio.gni → build_overrides/nlio.gni
diff --git a/gn/build_overrides/nlunit_test.gni → build_overrides/nlunit_test.gni b/gn/build_overrides/nlunit_test.gni → build_overrides/nlunit_test.gni
diff --git a/gn/build_overrides/nrf5_sdk.gni → build_overrides/nrf5_sdk.gni b/gn/build_overrides/nrf5_sdk.gni → build_overrides/nrf5_sdk.gni
diff --git a/gn/build_overrides/openthread.gni → build_overrides/openthread.gni b/gn/build_overrides/openthread.gni → build_overrides/openthread.gni
diff --git a/gn/build_overrides/ot_br_posix.gni → build_overrides/ot_br_posix.gni b/gn/build_overrides/ot_br_posix.gni → build_overrides/ot_br_posix.gni
diff --git a/gn/build_overrides/pigweed.gni → build_overrides/pigweed.gni b/gn/build_overrides/pigweed.gni → build_overrides/pigweed.gni
diff --git a/config/esp32/.gn b/config/esp32/.gn
@@ -18,9 +18,6 @@ buildconfig = "//build/config/BUILDCONFIG.gn"
 # CHIP uses angle bracket includes.
 check_system_includes = true
 
-# Allow loading paths relative to //gn.
-secondary_source = "//third_party/connectedhomeip/gn/"
-
 default_args = {
   target_cpu = "esp32"
   target_os = "freertos"

diff --git a/config/esp32/BUILD.gn b/config/esp32/BUILD.gn
@@ -17,7 +17,7 @@
 
 import("//build_overrides/chip.gni")
 
-import("${chip_root}/gn/chip/tests.gni")
+import("${chip_root}/build/chip/tests.gni")
 
 group("esp32") {
   deps = [ "${chip_root}/src/lib" ]

diff --git a/config/esp32/build b/config/esp32/build
@@ -0,0 +1 @@
+third_party/connectedhomeip/build
diff --git a/config/nrfconnect/.gn b/config/nrfconnect/.gn
@@ -18,9 +18,6 @@ buildconfig = "//build/config/BUILDCONFIG.gn"
 # CHIP uses angle bracket includes.
 check_system_includes = true
 
-# Allow loading paths relative to //gn.
-secondary_source = "//third_party/connectedhomeip/gn/"
-
 default_args = {
   target_cpu = "arm"
   target_os = "zephyr"

diff --git a/config/nrfconnect/BUILD.gn b/config/nrfconnect/BUILD.gn
@@ -14,7 +14,7 @@
 
 import("//build_overrides/chip.gni")
 
-import("//${chip_root}/gn/chip/tests.gni")
+import("//${chip_root}/build/chip/tests.gni")
 
 assert(current_os == "zephyr")
 

diff --git a/config/nrfconnect/build b/config/nrfconnect/build
@@ -0,0 +1 @@
+third_party/connectedhomeip/build
diff --git a/examples/chip-tool/.gn b/examples/chip-tool/.gn
@@ -18,9 +18,6 @@ buildconfig = "//build/config/BUILDCONFIG.gn"
 # CHIP uses angle bracket includes.
 check_system_includes = true
 
-# Allow loading paths relative to //gn.
-secondary_source = "//third_party/connectedhomeip/gn/"
-
 default_args = {
   import("//args.gni")
 }
diff --git a/examples/chip-tool/BUILD.gn b/examples/chip-tool/BUILD.gn
@@ -14,7 +14,7 @@
 
 import("//build_overrides/chip.gni")
 
-import("${chip_root}/gn/chip/tools.gni")
+import("${chip_root}/build/chip/tools.gni")
 
 assert(chip_build_tools)
 

diff --git a/examples/chip-tool/build b/examples/chip-tool/build
@@ -0,0 +1 @@
+third_party/connectedhomeip/build
diff --git a/examples/common/chip-app-server/.gn b/examples/common/chip-app-server/.gn
@@ -18,9 +18,6 @@ buildconfig = "//build/config/BUILDCONFIG.gn"
 # CHIP uses angle bracket includes.
 check_system_includes = true
 
-# Allow loading paths relative to //gn.
-secondary_source = "//third_party/connectedhomeip/gn/"
-
 default_args = {
   import("//args.gni")
 }
diff --git a/examples/common/chip-app-server/build b/examples/common/chip-app-server/build
@@ -0,0 +1 @@
+third_party/connectedhomeip/build
diff --git a/examples/lighting-app/efr32/.gn b/examples/lighting-app/efr32/.gn
@@ -18,9 +18,6 @@ buildconfig = "//build/config/BUILDCONFIG.gn"
 # CHIP uses angle bracket includes.
 check_system_includes = true
 
-# Allow loading paths relative to //gn.
-secondary_source = "//third_party/connectedhomeip/gn/"
-
 default_args = {
   target_cpu = "arm"
   target_os = "freertos"

diff --git a/examples/lighting-app/efr32/build b/examples/lighting-app/efr32/build
@@ -0,0 +1 @@
+third_party/connectedhomeip/build
diff --git a/examples/lighting-app/linux/.gn b/examples/lighting-app/linux/.gn
@@ -18,9 +18,6 @@ buildconfig = "//build/config/BUILDCONFIG.gn"
 # CHIP uses angle bracket includes.
 check_system_includes = true
 
-# Allow loading paths relative to //gn.
-secondary_source = "//third_party/connectedhomeip/gn/"
-
 default_args = {
   import("//args.gni")
 }
diff --git a/examples/lighting-app/linux/BUILD.gn b/examples/lighting-app/linux/BUILD.gn
@@ -14,7 +14,7 @@
 
 import("//build_overrides/chip.gni")
 
-import("${chip_root}/gn/chip/tools.gni")
+import("${chip_root}/build/chip/tools.gni")
 
 assert(chip_build_tools)
 

diff --git a/examples/lighting-app/linux/build b/examples/lighting-app/linux/build
@@ -0,0 +1 @@
+third_party/connectedhomeip/build
diff --git a/examples/lighting-app/nrf5/.gn b/examples/lighting-app/nrf5/.gn
@@ -18,9 +18,6 @@ buildconfig = "//build/config/BUILDCONFIG.gn"
 # CHIP uses angle bracket includes.
 check_system_includes = true
 
-# Allow loading paths relative to //gn.
-secondary_source = "//third_party/connectedhomeip/gn/"
-
 default_args = {
   target_cpu = "arm"
   target_os = "freertos"

diff --git a/examples/lighting-app/nrf5/build b/examples/lighting-app/nrf5/build
@@ -0,0 +1 @@
+third_party/connectedhomeip/build
diff --git a/examples/lock-app/efr32/.gn b/examples/lock-app/efr32/.gn
@@ -18,9 +18,6 @@ buildconfig = "//build/config/BUILDCONFIG.gn"
 # CHIP uses angle bracket includes.
 check_system_includes = true
 
-# Allow loading paths relative to //gn.
-secondary_source = "//third_party/connectedhomeip/gn/"
-
 default_args = {
   target_cpu = "arm"
   target_os = "freertos"

diff --git a/examples/lock-app/efr32/build b/examples/lock-app/efr32/build
@@ -0,0 +1 @@
+third_party/connectedhomeip/build
diff --git a/examples/lock-app/nrf5/.gn b/examples/lock-app/nrf5/.gn
@@ -18,9 +18,6 @@ buildconfig = "//build/config/BUILDCONFIG.gn"
 # CHIP uses angle bracket includes.
 check_system_includes = true
 
-# Allow loading paths relative to //gn.
-secondary_source = "//third_party/connectedhomeip/gn/"
-
 default_args = {
   target_cpu = "arm"
   target_os = "freertos"

diff --git a/examples/lock-app/nrf5/build b/examples/lock-app/nrf5/build
@@ -0,0 +1 @@
+third_party/connectedhomeip/build
diff --git a/examples/lock-app/qpg6100/.gn b/examples/lock-app/qpg6100/.gn
@@ -18,9 +18,6 @@ buildconfig = "//build/config/BUILDCONFIG.gn"
 # CHIP uses angle bracket includes.
 check_system_includes = true
 
-# Allow loading paths relative to //gn.
-secondary_source = "//third_party/connectedhomeip/gn/"
-
 default_args = {
   target_cpu = "arm"
   target_os = "freertos"

diff --git a/examples/lock-app/qpg6100/build b/examples/lock-app/qpg6100/build
@@ -0,0 +1 @@
+third_party/connectedhomeip/build
diff --git a/examples/pigweed-app/nrf5/.gn b/examples/pigweed-app/nrf5/.gn
@@ -18,9 +18,6 @@ buildconfig = "//build/config/BUILDCONFIG.gn"
 # CHIP uses angle bracket includes.
 check_system_includes = true
 
-# Allow loading paths relative to //gn.
-secondary_source = "//third_party/connectedhomeip/gn/"
-
 default_args = {
   target_cpu = "arm"
   target_os = "freertos"

diff --git a/examples/pigweed-app/nrf5/build b/examples/pigweed-app/nrf5/build
@@ -0,0 +1 @@
+third_party/connectedhomeip/build
diff --git a/examples/shell/.gn b/examples/shell/.gn
@@ -18,9 +18,6 @@ buildconfig = "//build/config/BUILDCONFIG.gn"
 # CHIP uses angle bracket includes.
 check_system_includes = true
 
-# Allow loading paths relative to //gn.
-secondary_source = "//third_party/connectedhomeip/gn/"
-
 default_args = {
   chip_build_tests = false
 }
diff --git a/examples/shell/BUILD.gn b/examples/shell/BUILD.gn
@@ -124,7 +124,7 @@ if (chip_device_platform == "nrf5") {
     deps = [ ":nrf5" ]
   }
 } else {
-  import("${chip_root}/gn/chip/tools.gni")
+  import("${chip_root}/build/chip/tools.gni")
 
   assert(chip_build_tools)
 

diff --git a/examples/shell/build b/examples/shell/build
@@ -0,0 +1 @@
+third_party/connectedhomeip/build
diff --git a/src/BUILD.gn b/src/BUILD.gn
@@ -14,7 +14,7 @@
 
 import("//build_overrides/chip.gni")
 
-import("${chip_root}/gn/chip/tests.gni")
+import("${chip_root}/build/chip/tests.gni")
 import("${chip_root}/src/lwip/lwip.gni")
 import("${chip_root}/src/platform/device.gni")
 
@@ -33,7 +33,7 @@ config("includes") {
 }
 
 if (chip_build_tests) {
-  import("${chip_root}/gn/chip/chip_test_group.gni")
+  import("${chip_root}/build/chip/chip_test_group.gni")
 
   chip_test_group("tests") {
     deps = [

diff --git a/src/ble/BUILD.gn b/src/ble/BUILD.gn
@@ -14,8 +14,8 @@
 
 import("//build_overrides/chip.gni")
 
-import("${chip_root}/gn/chip/buildconfig_header.gni")
-import("${chip_root}/gn/chip/tests.gni")
+import("${chip_root}/build/chip/buildconfig_header.gni")
+import("${chip_root}/build/chip/tests.gni")
 import("${chip_root}/src/platform/device.gni")
 import("ble.gni")
 

diff --git a/src/ble/tests/BUILD.gn b/src/ble/tests/BUILD.gn
@@ -15,7 +15,7 @@
 import("//build_overrides/chip.gni")
 import("//build_overrides/nlunit_test.gni")
 
-import("${chip_root}/gn/chip/chip_test_suite.gni")
+import("${chip_root}/build/chip/chip_test_suite.gni")
 
 chip_test_suite("tests") {
   output_name = "libBleLayerTests"

diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
@@ -13,8 +13,9 @@
 # limitations under the License.
 
 import("//build_overrides/chip.gni")
-import("//gn/build/config/android_abi.gni")
-import("//gn/chip/java/rules.gni")
+
+import("//build/config/android_abi.gni")
+import("${chip_root}/build/chip/java/rules.gni")
 
 shared_library("jni") {
   output_name = "libCHIPController"

diff --git a/src/controller/python/BUILD.gn b/src/controller/python/BUILD.gn
@@ -15,7 +15,7 @@
 import("//build_overrides/chip.gni")
 import("//build_overrides/pigweed.gni")
 
-import("${chip_root}/gn/chip/tools.gni")
+import("${chip_root}/build/chip/tools.gni")
 import("${dir_pw_unit_test}/test.gni")
 
 config("controller_wno_deprecate") {
@@ -118,7 +118,10 @@ pw_python_script("python") {
 
   public_deps = [ ":ChipDeviceCtrl" ]
 
-  pythontags = exec_script("//chip/python_gen_tags.py", [], "list lines", [])
+  pythontags = exec_script("${chip_root}/build/chip/python_gen_tags.py",
+                           [],
+                           "list lines",
+                           [])
   pythontagsStr = string_join("", pythontags)
   output_name = "chip-0.0-$pythontagsStr.whl"
   outputs = [ "${_dist_dir}/$output_name" ]

diff --git a/src/crypto/BUILD.gn b/src/crypto/BUILD.gn
@@ -15,7 +15,7 @@
 import("//build_overrides/chip.gni")
 import("//build_overrides/nlassert.gni")
 
-import("${chip_root}/gn/chip/buildconfig_header.gni")
+import("${chip_root}/build/chip/buildconfig_header.gni")
 
 import("crypto.gni")