commit 06b926d5af978a3f55ee650204905ae411407b64
author Jorge E. Moreira <jemoreira@google.com> Mon Apr 26 23:57:41 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 26 23:57:41 2021 +0000
tree 3ed4f71564f78fb702412335da032629712bf1f3
parent b0e9c0c26b75a633ca51fd1d4ac01c603b6248e0
parent 7728b23a4c8c9fe64126df78c24d366aad6720cb

Configure apex so crosvm can depend on this crate am: 784e24eb3f am: d4865997bc am: 71bc75fce8 am: 7728b23a4c

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1684666

Change-Id: Idd4a6b8ca219c6225c7307fa8b4cdbdfc57b426e

Android.bp

diff --git a/Android.bp b/Android.bp
index e99d7e0..cdf2b8d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --device --run --dependencies.
+// This file is generated by cargo2android.py --device --run --dependencies --patch=patches/Android.bp.patch.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     default_applicable_licenses: ["external_rust_crates_smallvec_license"],
@@ -42,4 +43,8 @@
     crate_name: "smallvec",
     srcs: ["src/lib.rs"],
     edition: "2018",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }

patches/Android.bp.patch

diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
new file mode 100644
index 0000000..5943f32
--- /dev/null
+++ b/patches/Android.bp.patch
@@ -0,0 +1,13 @@
+diff --git a/Android.bp b/Android.bp
+index e99d7e0..12fdabd 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -42,4 +42,8 @@ rust_library {
+     crate_name: "smallvec",
+     srcs: ["src/lib.rs"],
+     edition: "2018",
++    apex_available: [
++        "//apex_available:platform",
++        "com.android.virt",
++    ],
+ }