aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Scull <ascull@google.com>2022-05-23 18:42:08 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-05-23 18:42:08 +0000
commitfc2e85ad8d243e515457f818c005b8d7029ba472 (patch)
tree6fb3e7502878d43f400282247425f2ba70e8e233
parentab5c95f88685f6e86e380838a015ff7184966df5 (diff)
parent5c8e10da30159587fa6289fdc72e5d179b187508 (diff)
downloadforeign-types-fc2e85ad8d243e515457f818c005b8d7029ba472.tar.gz
Allow the virtualization APEX to use the crate am: 5c8e10da30
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/foreign-types/+/2102625 Change-Id: I3c788122902e91b3e9bed4cae53805dbd05fd7fc 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 31c4920..6c343d1 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_license"],
}
@@ -50,4 +48,8 @@ rust_library_rlib {
rustlibs: [
"libforeign_types_shared",
],
+ 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
+}