Snap for 7874456 from c1243329b6b3b71cb410cec67fdce8d6b1f436e1 to tm-d1-release

Change-Id: Ice510019deac415aabcd7e8de341e42d67d45638

2 files changed, 26 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index fe8ffb5..bfe4eef 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --device --run --dependencies --tests.
+// 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_ppv-lite86_license"],
@@ -40,18 +41,26 @@ rust_library {
     name: "libppv_lite86",
     host_supported: true,
     crate_name: "ppv_lite86",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.10",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: [
         "default",
         "std",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }
 
 rust_defaults {
-    name: "ppv-lite86_defaults",
+    name: "ppv-lite86_test_defaults",
     crate_name: "ppv_lite86",
     srcs: ["src/lib.rs"],
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.10",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2018",
@@ -63,10 +72,13 @@ rust_defaults {
 
 rust_test_host {
     name: "ppv-lite86_host_test_src_lib",
-    defaults: ["ppv-lite86_defaults"],
+    defaults: ["ppv-lite86_test_defaults"],
+    test_options: {
+        unit_test: true,
+    },
 }
 
 rust_test {
     name: "ppv-lite86_device_test_src_lib",
-    defaults: ["ppv-lite86_defaults"],
+    defaults: ["ppv-lite86_test_defaults"],
 }
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..72ca2d4
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,10 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "dependencies": true,
+  "device": true,
+  "run": true,
+  "tests": true
+}