Google Git
Sign in
android/trusty/lib/9a87e0458d6c14f784e6c82ff8ac1a57d9a8416f^1..9a87e0458d6c14f784e6c82ff8ac1a57d9a8416f/.
commit
9a87e0458d6c14f784e6c82ff8ac1a57d9a8416f
[log]
author
Per Larsen <perlarsen@google.com>
Fri Jan 17 20:36:48 2025 -0800
committer
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Fri Jan 17 20:36:48 2025 -0800
tree
149906d79e4266897332876ee875d47555c75d96
parent
45f8d1212d69ff5617432b82aa09d2153db95b30 [diff]
parent
a34f1504f6c7c5a91fdf2f49f17bafebc9576997 [diff]
make: Don't rustdoc libraries from Rust's stdlib am: a34f1504f6

Original change: https://android-review.googlesource.com/c/trusty/lib/+/3455802

Change-Id: Ib362a2fa3a65776dc51d2c5ff8425d0e8d3dfdce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

diff --git a/lib/liballoc-rust/rules.mk b/lib/liballoc-rust/rules.mk
index 14f1b73..92dd080 100644
--- a/lib/liballoc-rust/rules.mk
+++ b/lib/liballoc-rust/rules.mk

@@ -36,4 +36,8 @@
 
 MODULE_ADD_IMPLICIT_DEPS := false
 
+# TODO: figure out why as of Rust 1.82, rustdoc fails nsjailed Soong builds
+# whereas regular (build.py) builds still work fine.
+MODULE_SKIP_DOCS := true
+
 include make/library.mk

diff --git a/lib/libcore-rust/rules.mk b/lib/libcore-rust/rules.mk
index b6632e7..f1cafe0 100644
--- a/lib/libcore-rust/rules.mk
+++ b/lib/libcore-rust/rules.mk

@@ -38,4 +38,8 @@
 
 MODULE_ADD_IMPLICIT_DEPS := false
 
+# TODO: figure out why as of Rust 1.82, rustdoc fails nsjailed Soong builds
+# whereas regular (build.py) builds still work fine.
+MODULE_SKIP_DOCS := true
+
 include make/library.mk

diff --git a/lib/libhashbrown-rust/rules.mk b/lib/libhashbrown-rust/rules.mk
index a796560..674fa58 100644
--- a/lib/libhashbrown-rust/rules.mk
+++ b/lib/libhashbrown-rust/rules.mk

@@ -43,4 +43,8 @@
 	trusty/user/base/lib/liballoc-rust \
 	trusty/user/base/lib/libcompiler_builtins-rust \
 
+# TODO: figure out why as of Rust 1.82, rustdoc fails nsjailed Soong builds
+# whereas regular (build.py) builds still work.
+MODULE_SKIP_DOCS := true
+
 include make/library.mk

diff --git a/lib/libpanic_abort-rust/rules.mk b/lib/libpanic_abort-rust/rules.mk
index 683525e..d0a8e4d 100644
--- a/lib/libpanic_abort-rust/rules.mk
+++ b/lib/libpanic_abort-rust/rules.mk

@@ -32,4 +32,8 @@
 
 MODULE_ADD_IMPLICIT_DEPS := false
 
+# TODO: figure out why as of Rust 1.82, rustdoc fails nsjailed Soong builds
+# whereas regular (build.py) builds still work.
+MODULE_SKIP_DOCS := true
+
 include make/library.mk

diff --git a/lib/librustc-demangle-rust/rules.mk b/lib/librustc-demangle-rust/rules.mk
index 4ae1311..3f0dce6 100644
--- a/lib/librustc-demangle-rust/rules.mk
+++ b/lib/librustc-demangle-rust/rules.mk

@@ -34,4 +34,8 @@
 
 MODULE_ADD_IMPLICIT_DEPS := false
 
+# TODO: figure out why as of Rust 1.82, rustdoc fails nsjailed Soong builds
+# whereas regular (build.py) builds still work.
+MODULE_SKIP_DOCS := true
+
 include make/library.mk

diff --git a/lib/libstd_detect-rust/rules.mk b/lib/libstd_detect-rust/rules.mk
index 5e667f8..c66d531 100644
--- a/lib/libstd_detect-rust/rules.mk
+++ b/lib/libstd_detect-rust/rules.mk

@@ -37,4 +37,8 @@
 
 MODULE_ADD_IMPLICIT_DEPS := false
 
+# TODO: figure out why as of Rust 1.82, rustdoc fails nsjailed Soong builds
+# whereas regular (build.py) builds still work.
+MODULE_SKIP_DOCS := true
+
 include make/library.mk

diff --git a/lib/libunwind-rust/rules.mk b/lib/libunwind-rust/rules.mk
index 1193069..861c4f1 100644
--- a/lib/libunwind-rust/rules.mk
+++ b/lib/libunwind-rust/rules.mk

@@ -33,4 +33,8 @@
 
 MODULE_ADD_IMPLICIT_DEPS := false
 
+# TODO: figure out why as of Rust 1.82, rustdoc fails nsjailed Soong builds
+# whereas regular (build.py) builds still work.
+MODULE_SKIP_DOCS := true
+
 include make/library.mk