aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-11-12 18:13:22 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-11-12 18:13:22 +0000
commit6746910e652d2ecca1bc9197149518f86c55167d (patch)
treed2f795386141055cabc25e1969bb76f9c24a6ba5
parentd0f645562afdfce4f349a96d95904e09357c6126 (diff)
parentb0bd729cd989095d1a254a3223ee4eb06ab9738a (diff)
downloadlazy_static-6746910e652d2ecca1bc9197149518f86c55167d.tar.gz
Merge "Make vendor available." am: 7bfffdb61c am: 92302a26da am: 1bde812081 am: b0bd729cd9
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/lazy_static/+/1886370 Change-Id: I012ac4c9b64fc7710a7a0e9d760165464c75acca
-rw-r--r--Android.bp1
-rw-r--r--cargo2android.json3
2 files changed, 3 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 401c1f1..2453dfe 100644
--- a/Android.bp
+++ b/Android.bp
@@ -94,6 +94,7 @@ rust_library {
name: "liblazy_static",
// has rustc warnings
host_supported: true,
+ vendor_available: true,
crate_name: "lazy_static",
cargo_env_compat: true,
cargo_pkg_version: "1.4.0",
diff --git a/cargo2android.json b/cargo2android.json
index 091119e..63c1f22 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -11,9 +11,10 @@
],
"device": true,
"min-sdk-version": "29",
+ "vendor_available": true,
"run": true,
"test-blocklist": [
"tests/no_std.rs"
],
"tests": true
-} \ No newline at end of file
+}