summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Scull <ascull@google.com>2022-05-23 18:16:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-05-23 18:16:37 +0000
commit06a59a392fbca668d61f458ecb75e614ebd8ac0e (patch)
tree969d7686b1aa8667b0469da8dfb86f7990cbea09
parentbbf64bcca6612df836cf258bdaae3fcccdf8210b (diff)
parent69bb518f3c8a3b3694c5fae476ded6080d248759 (diff)
downloadforeign-types-shared-06a59a392fbca668d61f458ecb75e614ebd8ac0e.tar.gz
Allow the virtualization APEX to use the crate am: 69bb518f3c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/foreign-types-shared/+/2102724 Change-Id: Ia3578a2b8447fc232dc98057161c908133b31c1f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp8
-rw-r--r--cargo2android.json9
2 files changed, 14 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index 165c010..bdecc97 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
-// This file is generated by cargo2android.py --run --device --force-rlib.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
-
-
package {
default_applicable_licenses: [
"external_rust_crates_foreign-types-shared_license",
@@ -49,4 +47,8 @@ rust_library_rlib {
cargo_pkg_version: "0.1.0",
srcs: ["src/lib.rs"],
edition: "2015",
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..dbbd0bb
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,9 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "device": true,
+ "force-rlib": true,
+ "run": true
+}