build: Move Pigweed config below Maize specific config
Change-Id: I926456af2b65c294c2f9f9a47366fcc72acb02ec
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/maize/+/260333
Lint: Lint 🤖 <android-build-ayeaye@system.gserviceaccount.com>
Commit-Queue: Erik Gilling <konkers@google.com>
Reviewed-by: Armando Montanez <amontanez@google.com>
diff --git a/.bazelrc b/.bazelrc
index 50c329a..fef7b59 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -12,57 +12,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-# Standard Pigweed flags
-# ======================
-# All Pigweed projects are expected to set these flags. They mostly pre-adopt
-# future Bazel settings, and most are critical to working around known issues.
-#
-# The source of truth for these flags is @pigweed//pw_build:pigweed.bazelrc in
-# the main Pigweed repo.
-
-# Don't automatically create __init__.py files.
-#
-# This prevents spurious package name collisions at import time, and should be
-# the default (https://github.com/bazelbuild/bazel/issues/7386). It's
-# particularly helpful for Pigweed, because we have many potential package name
-# collisions due to a profusion of stuttering paths like
-# pw_transfer/py/pw_transfer.
-common --incompatible_default_to_explicit_init_py
-
-# Do not attempt to configure an autodetected (local) toolchain. We vendor all
-# our toolchains, and CI VMs may not have any local toolchain to detect.
-common --repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
-
-# Don't propagate flags or defines to the exec config. This will become the
-# default one day (https://github.com/bazelbuild/bazel/issues/22457) and will
-# improve cache hit rates between builds targeting different platforms. This is
-# especially impactful for large host tools like protoc, which will have its
-# cache invalidated when your host C++ config changes, causing many rebuilds
-# of protoc (https://pwbug.dev/315871648).
-common --experimental_exclude_defines_from_exec_config
-
-# TODO: https://github.com/bazelbuild/bazel/issues/22457 - This option breaks
-# being able to select the nightly toolchian for the exec config.
-# See above for why it's enabled in Pigweed.
-# common --experimental_exclude_starlark_flags_from_exec_config
-
-# Enforces consistent action environment variables. This is important to
-# address Protobuf's rebuild sensitivity on changes to the environment
-# variables. It also improves cache hit rates. Should be true by default one
-# day (https://github.com/bazelbuild/bazel/issues/7026).
-build --incompatible_strict_action_env
-
-# Expose exec toolchains for Python. We use these toolchains in some rule
-# implementations (git grep for
-# "@rules_python//python:exec_tools_toolchain_type").
-build --@rules_python//python/config_settings:exec_tools_toolchain=enabled
-
-# TODO: https://github.com/bazelbuild/rules_python/issues/2515 - This flag was
-# enabled with Bazel 8.0.0, but it breaks py_proto_library imports when using
-# the latest release of rules_python (1.0.0). Flipping this flag is a temporary
-# workaround.
-common --legacy_external_runfiles=True
-
# General Bazel configuration
# ===========================
common --verbose_failures
@@ -120,6 +69,56 @@
-serial mon:stdio \
-kernel "
+# Standard Pigweed flags
+# ======================
+# All Pigweed projects are expected to set these flags. They mostly pre-adopt
+# future Bazel settings, and most are critical to working around known issues.
+#
+# The source of truth for these flags is @pigweed//pw_build:pigweed.bazelrc in
+# the main Pigweed repo.
+
+# Don't automatically create __init__.py files.
+#
+# This prevents spurious package name collisions at import time, and should be
+# the default (https://github.com/bazelbuild/bazel/issues/7386). It's
+# particularly helpful for Pigweed, because we have many potential package name
+# collisions due to a profusion of stuttering paths like
+# pw_transfer/py/pw_transfer.
+common --incompatible_default_to_explicit_init_py
+
+# Do not attempt to configure an autodetected (local) toolchain. We vendor all
+# our toolchains, and CI VMs may not have any local toolchain to detect.
+common --repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
+
+# Don't propagate flags or defines to the exec config. This will become the
+# default one day (https://github.com/bazelbuild/bazel/issues/22457) and will
+# improve cache hit rates between builds targeting different platforms. This is
+# especially impactful for large host tools like protoc, which will have its
+# cache invalidated when your host C++ config changes, causing many rebuilds
+# of protoc (https://pwbug.dev/315871648).
+common --experimental_exclude_defines_from_exec_config
+
+# This option breaks being able to select the nightly toolchian for the exec
+# config. See above for why it's enabled in Pigweed.
+# common --experimental_exclude_starlark_flags_from_exec_config
+
+# Enforces consistent action environment variables. This is important to
+# address Protobuf's rebuild sensitivity on changes to the environment
+# variables. It also improves cache hit rates. Should be true by default one
+# day (https://github.com/bazelbuild/bazel/issues/7026).
+build --incompatible_strict_action_env
+
+# Expose exec toolchains for Python. We use these toolchains in some rule
+# implementations (git grep for
+# "@rules_python//python:exec_tools_toolchain_type").
+build --@rules_python//python/config_settings:exec_tools_toolchain=enabled
+
+# TODO: https://github.com/bazelbuild/rules_python/issues/2515 - This flag was
+# enabled with Bazel 8.0.0, but it breaks py_proto_library imports when using
+# the latest release of rules_python (1.0.0). Flipping this flag is a temporary
+# workaround.
+common --legacy_external_runfiles=True
+
# Remote execution config definitions
# ===================================
# Use the remote cache. This will only work for users who have permission to access it.
