summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYecheng Zhao <zyecheng@google.com>2024-02-21 17:34:59 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-02-21 17:34:59 +0000
commita2b4ee3ecc2b09558521fe2038c1c12e49619f02 (patch)
tree13fcb6c5ba66136160cfe74b6e0cae81781760e3
parenta8b35ba76a891e6ab503f8a1702847280d5e650a (diff)
parentf5ae2919e6d8b3201417a4b656a76c61fcce6d7a (diff)
downloadlibbootloader-a2b4ee3ecc2b09558521fe2038c1c12e49619f02.tar.gz
Merge "Fix typo in host ruststd path" into main
-rw-r--r--gbl/libstorage/BUILD4
-rw-r--r--gbl/tests/BUILD6
-rw-r--r--gbl/toolchain/BUILD.android_rust_prebuilts.bazel2
3 files changed, 5 insertions, 7 deletions
diff --git a/gbl/libstorage/BUILD b/gbl/libstorage/BUILD
index 7407e7a..31ac4b4 100644
--- a/gbl/libstorage/BUILD
+++ b/gbl/libstorage/BUILD
@@ -33,7 +33,7 @@ rust_library(
)
rust_test(
- name = "gbl_libstorage_test",
+ name = "libstorage_test",
compile_data = [
"@gbl//libstorage/test:gpt_test.bin",
"@gbl//libstorage/test:boot_a.bin",
@@ -43,6 +43,6 @@ rust_test(
)
rust_doc_test(
- name = "gbl_libstorage_doc_test",
+ name = "libstorage_doc_test",
crate = ":libstorage",
)
diff --git a/gbl/tests/BUILD b/gbl/tests/BUILD
index 071d6c0..facae78 100644
--- a/gbl/tests/BUILD
+++ b/gbl/tests/BUILD
@@ -20,10 +20,8 @@ test_suite(
"@gbl//libefi:libefi_test",
"@gbl//libfastboot:libfastboot_test",
"@gbl//libfdt:libfdt_test",
- "@gbl//libstorage:gbl_libstorage_test",
+ "@gbl//libstorage:libstorage_doc_test",
+ "@gbl//libstorage:libstorage_test",
"@gbl//third_party/libzbi:libzbi_test",
-
- # Doc test doesn't work yet.
- # "@gbl//libstorage:gbl_libstorage_doc_test",
],
)
diff --git a/gbl/toolchain/BUILD.android_rust_prebuilts.bazel b/gbl/toolchain/BUILD.android_rust_prebuilts.bazel
index f712d0a..87b40d1 100644
--- a/gbl/toolchain/BUILD.android_rust_prebuilts.bazel
+++ b/gbl/toolchain/BUILD.android_rust_prebuilts.bazel
@@ -30,7 +30,7 @@ filegroup(
# sysroot prebuilts for x86_64_unknown-linux-gnu
rust_stdlib_filegroup(
name = "prebuilt_stdlibs",
- srcs = glob(["lib/rustlib/x86_64_unknown-linux-gnu/*"]),
+ srcs = glob(["lib/rustlib/x86_64-unknown-linux-gnu/lib/*"]),
)
# sysroot prebuilts for aarch64_unknown-uefi