aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-10-08 22:17:36 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-08 22:17:36 +0000
commit00cffdb3c671d65e7e57c853281caa5b801f54df (patch)
tree42ccb5fba1a1253b0d2f8c570e13a0d6f0e3dc9a
parentd8ecfc4a2fe7bc69b2491899a05e42562aa6ad5a (diff)
parentad90c9ceac5f791149d552a1d5b402f3b84dd4e1 (diff)
downloadhalf-00cffdb3c671d65e7e57c853281caa5b801f54df.tar.gz
Merge "Add apex to half rust crate" am: a4e6687c4c am: 9716a326e0 am: 6b3171c4db am: 7876ab3831 am: ad90c9ceac
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/half/+/1850622 Change-Id: I38b9a6d0175dbc6854ea39122e64bca3c284dd07
-rw-r--r--Android.bp8
-rw-r--r--cargo2android.json8
2 files changed, 15 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index efec440..205751e 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 {
@@ -41,6 +41,12 @@ rust_library {
name: "libhalf",
host_supported: true,
crate_name: "half",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.7.1",
srcs: ["src/lib.rs"],
edition: "2018",
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..5ce6188
--- /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