diff options
author | Yifan Hong <elsk@google.com> | 2024-05-03 17:23:43 -0700 |
---|---|---|
committer | Yifan Hong <elsk@google.com> | 2024-05-03 17:35:51 -0700 |
commit | 10df5d1ba7f59a2da3d2764b3db71457d2d0e298 (patch) | |
tree | ad44b75e6688f665c05a757a9ac1d573a409d23b | |
parent | 51c6e4c7e95e1ddeb523abbde1ffd9efd78f03a7 (diff) | |
download | manifest-10df5d1ba7f59a2da3d2764b3db71457d2d0e298.tar.gz |
Mark external deps as ddk-external.
Mark selected external dependencies as ddk-external
group instead of the ddk group. This consists of
projects that are registered on BCR, so technically,
they are not needed unless for truly local builds.
The mirrored BCR is also marked as ddk-external because
a DDK module can use --registry=http://registry.bazel.build
to override the flag from bzlmod.bazelrc.
Drop stardoc because it is a dev_dependency of @kleaf
and usually isn't needed.
Add rules_rust for consistency with android15-6.6
even though rust has not been enabled on mainline.
This eliminates branches in tooling so we don't
have to optionally omit local_path_override
for rules_rust.
Test: TH
Bug: 338439996
Change-Id: I78a1e53fc97e79352e87ee5d58d2676e7322d5ac
-rw-r--r-- | default.xml | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/default.xml b/default.xml index cba9cb1..fa57e18 100644 --- a/default.xml +++ b/default.xml @@ -9,6 +9,7 @@ <linkfile src="kleaf/bazel.sh" dest="tools/bazel" /> <linkfile src="kleaf/bzlmod/bazel.MODULE.bazel" dest="MODULE.bazel" /> </project> + <project path="build/bazel_common_rules" name="platform/build/bazel_common_rules" groups="ddk" /> <project path="common" name="kernel/common" revision="android-mainline" /> <project path="kernel/common-patches" name="kernel/common-patches" > <linkfile src="android-mainline" dest="common/patches" /> @@ -29,22 +30,22 @@ <project path="prebuilts/jdk/jdk11" name="platform/prebuilts/jdk/jdk11" revision="main-kernel" clone-depth="1" groups="ddk" /> <project path="prebuilts/ndk-r26" name="toolchain/prebuilts/ndk/r26" clone-depth="1" groups="ddk" /> - <project path="external/bazel-skylib" name="platform/external/bazel-skylib" groups="ddk" /> - <project path="build/bazel_common_rules" name="platform/build/bazel_common_rules" groups="ddk" /> <project path="external/libcap-ng" name="platform/external/libcap-ng"/> <project path="external/libcap" name="platform/external/libcap"/> - <project path="external/stardoc" name="platform/external/stardoc" groups="ddk" /> - <project path="external/python/absl-py" name="platform/external/python/absl-py" groups="ddk" /> - <project path="external/bazelbuild-bazel-central-registry" name="platform/external/bazelbuild-bazel-central-registry" revision="main-kernel" groups="ddk" /> - <project path="external/bazelbuild-platforms" name="platform/external/bazelbuild-platforms" groups="ddk" /> - <!-- implicit dep for bzlmod --> - <project path="external/bazelbuild-apple_support" name="platform/external/bazelbuild-apple_support" groups="ddk" /> - <project path="external/bazelbuild-rules_cc" name="platform/external/bazelbuild-rules_cc" groups="ddk" /> - <project path="external/bazelbuild-rules_java" name="platform/external/bazelbuild-rules_java" groups="ddk"/> - <project path="external/bazelbuild-rules_license" name="platform/external/bazelbuild-rules_license" groups="ddk" /> - <project path="external/bazelbuild-rules_pkg" name="platform/external/bazelbuild-rules_pkg" groups="ddk" /> - <project path="external/bazelbuild-rules_python" name="platform/external/bazelbuild-rules_python" groups="ddk"/> - <project path="external/bazelbuild-rules_rust" name="platform/external/bazelbuild-rules_rust" /> + + <!-- deps for for bzlmod --> + <project path="external/bazel-skylib" name="platform/external/bazel-skylib" groups="ddk-external" /> + <project path="external/bazelbuild-bazel-central-registry" name="platform/external/bazelbuild-bazel-central-registry" revision="main-kernel" groups="ddk-external" /> + <project path="external/bazelbuild-platforms" name="platform/external/bazelbuild-platforms" groups="ddk-external" /> + <project path="external/bazelbuild-apple_support" name="platform/external/bazelbuild-apple_support" groups="ddk-external" /> + <project path="external/bazelbuild-rules_cc" name="platform/external/bazelbuild-rules_cc" groups="ddk-external" /> + <project path="external/bazelbuild-rules_java" name="platform/external/bazelbuild-rules_java" groups="ddk-external"/> + <project path="external/bazelbuild-rules_license" name="platform/external/bazelbuild-rules_license" groups="ddk-external" /> + <project path="external/bazelbuild-rules_pkg" name="platform/external/bazelbuild-rules_pkg" groups="ddk-external" /> + <project path="external/bazelbuild-rules_python" name="platform/external/bazelbuild-rules_python" groups="ddk-external" /> + <project path="external/bazelbuild-rules_rust" name="platform/external/bazelbuild-rules_rust" groups="ddk-external" /> + <project path="external/python/absl-py" name="platform/external/python/absl-py" groups="ddk-external" /> + <project path="external/stardoc" name="platform/external/stardoc" /> <!-- dependencies used to build toolchain from sources --> <project path="external/pigz" name="platform/external/pigz" groups="ddk"/> |