Merge "Ensure crate is compiled with std for panic handler" into main am: 48d878c651

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/percent-encoding/+/3080027

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

patches/std.diff

diff --git a/patches/std.diff b/patches/std.diff
new file mode 100644
index 0000000..76feb4e
--- /dev/null
+++ b/patches/std.diff
@@ -0,0 +1,14 @@
+diff --git a/src/lib.rs b/src/lib.rs
+index 46a5d74..21d8a61 100644
+--- a/src/lib.rs
++++ b/src/lib.rs
+@@ -41,6 +41,9 @@
+ #[cfg(feature = "alloc")]
+ extern crate alloc;
+ 
++#[cfg(android_dylib)]
++extern crate std;
++
+ #[cfg(feature = "alloc")]
+ use alloc::{
+     borrow::{Cow, ToOwned},

src/lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 46a5d74..21d8a61 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -41,6 +41,9 @@
 #[cfg(feature = "alloc")]
 extern crate alloc;
 
+#[cfg(android_dylib)]
+extern crate std;
+
 #[cfg(feature = "alloc")]
 use alloc::{
     borrow::{Cow, ToOwned},