diff options
| author | Matthew Maurer <mmaurer@google.com> | 2024-01-26 20:28:47 +0000 |
|---|---|---|
| committer | Matthew Maurer <mmaurer@google.com> | 2024-01-26 20:28:47 +0000 |
| commit | 840dcd35c0e53cef2acf419b54ac27f637ee72f8 (patch) | |
| tree | 8f961fd4f8694dfab56f721863d6548c695a60c5 | |
| parent | d11281d7d0836841fa888329b5457b2258220897 (diff) | |
| download | build-840dcd35c0e53cef2acf419b54ac27f637ee72f8.tar.gz | |
Revert "kleaf: workspace.bzl: Expand import_external_repositories"
Revert submission 2922866
Reason for revert: Retargeting to `android15-6.6`, no reason to have any divergence on this branch.
Reverted changes: /q/submissionid:2922866
Change-Id: If584557f5e971ec232b4eecf58d901015c954138
| -rw-r--r-- | kleaf/workspace.bzl | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/kleaf/workspace.bzl b/kleaf/workspace.bzl index 6486e5f..96a397f 100644 --- a/kleaf/workspace.bzl +++ b/kleaf/workspace.bzl @@ -16,7 +16,7 @@ Defines repositories in a Kleaf workspace. """ -load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") +load("//build/bazel_common_rules/workspace:external.bzl", "import_external_repositories") load( "//build/kernel/kleaf:constants.bzl", "CI_TARGET_MAPPING", @@ -61,22 +61,11 @@ WARNING: define_kleaf_workspace() should be called with common_kernel_package={} repr(common_kernel_package), )) - maybe( - repo_rule = native.local_repository, - name = "bazel_skylib", - path = "external/bazel-skylib", - ) - - maybe( - repo_rule = native.local_repository, - name = "io_abseil_py", - path = "external/python/absl-py", - ) - - maybe( - repo_rule = native.local_repository, - name = "io_bazel_stardoc", - path = "external/stardoc", + import_external_repositories( + # keep sorted + bazel_skylib = True, + io_abseil_py = True, + io_bazel_stardoc = True, ) # The prebuilt NDK does not support Bazel. |