Merge "Add apex to instant rust crate" am: 10d03175e5 am: 2be6b1866c am: c29420be31 am: 5125a26022 am: 2eb4f95a4b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/instant/+/1850757
Change-Id: I3b190163affd7a7fe7929ee5a978f9ce899a292a
diff --git a/Android.bp b/Android.bp
index c723067..2ad30c0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -22,12 +22,15 @@
name: "libinstant",
host_supported: true,
crate_name: "instant",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.1.10",
srcs: ["src/lib.rs"],
edition: "2018",
rustlibs: [
"libcfg_if",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
-
-// dependent_library ["feature_list"]
-// cfg-if-1.0.0
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..340481e
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,8 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "device": true,
+ "run": true
+}
\ No newline at end of file
