From 24ff8fb0ac6d1a00349eff2b9c0ca8fbe70530f1 Mon Sep 17 00:00:00 2001
From: Matthew Maurer <mmaurer@google.com>
Date: Mon, 6 Jul 2020 13:33:23 -0700
Subject: Support building all variants.

Bug: 143217452
Test: cd external/rust; mma; atest in all TEST_MAPPING subdirs
Change-Id: Id15d48d6f6a89607266dabdecae7cea3c80503e2
---
 Android.bp | 2 +-
 src/lib.rs | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index 0c81aad..94c8998 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,6 +1,6 @@
 // This file is generated by cargo2android.py --run --device.
 
-rust_library_rlib {
+rust_library {
     name: "libpaste",
     host_supported: true,
     crate_name: "paste",
diff --git a/src/lib.rs b/src/lib.rs
index 9cb79d9..ab5806a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -137,6 +137,9 @@
 
 #![no_std]
 
+// ANDROID: Use std to allow building as a dylib.
+extern crate std;
+
 use proc_macro_hack::proc_macro_hack;
 
 /// Paste identifiers within a macro invocation that expands to an expression.
-- 
cgit v1.2.3