commit c6376f26f2df351a47194aacf7f360f10159f4f2
author Andrei Homescu <ahomescu@google.com> Tue Oct 12 02:27:04 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 12 02:27:04 2021 +0000
tree 04c5651d278e9706a3fc9727131bb1c81a0196c7
parent d533c04cda3d3c47b93402692a07988fc6b7ffbc
parent d73e0e09804547a3fe430f3792a11e15fe58cde7

Add downcast_rs to com.android.compos am: e573e5d6a0 am: d73e0e0980

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/downcast-rs/+/1849775

Change-Id: I119c47bc645a69a04d8c101f51e1abe25aa16d1b

Android.bp

diff --git a/Android.bp b/Android.bp
index 7f43e87..191d2f0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,9 +25,11 @@
 }
 
 rust_defaults {
-    name: "downcast-rs_defaults",
+    name: "downcast-rs_test_defaults",
     crate_name: "downcast_rs",
     srcs: ["src/lib.rs"],
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.2.0",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2015",
@@ -39,7 +41,7 @@
 
 rust_test_host {
     name: "downcast-rs_host_test_src_lib",
-    defaults: ["downcast-rs_defaults"],
+    defaults: ["downcast-rs_test_defaults"],
     test_options: {
         unit_test: true,
     },
@@ -47,12 +49,14 @@
 
 rust_test {
     name: "downcast-rs_device_test_src_lib",
-    defaults: ["downcast-rs_defaults"],
+    defaults: ["downcast-rs_test_defaults"],
 }
 
 rust_defaults {
-    name: "downcast-rs_defaults_downcast_rs",
+    name: "downcast-rs_test_defaults_downcast_rs",
     crate_name: "downcast_rs",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.2.0",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2015",
@@ -67,7 +71,7 @@
 
 rust_test_host {
     name: "downcast-rs_host_test_tests_import_via_macro_use",
-    defaults: ["downcast-rs_defaults_downcast_rs"],
+    defaults: ["downcast-rs_test_defaults_downcast_rs"],
     srcs: ["tests/import_via_macro_use.rs"],
     test_options: {
         unit_test: true,
@@ -76,13 +80,13 @@
 
 rust_test {
     name: "downcast-rs_device_test_tests_import_via_macro_use",
-    defaults: ["downcast-rs_defaults_downcast_rs"],
+    defaults: ["downcast-rs_test_defaults_downcast_rs"],
     srcs: ["tests/import_via_macro_use.rs"],
 }
 
 rust_test_host {
     name: "downcast-rs_host_test_tests_use_via_namespace",
-    defaults: ["downcast-rs_defaults_downcast_rs"],
+    defaults: ["downcast-rs_test_defaults_downcast_rs"],
     srcs: ["tests/use_via_namespace.rs"],
     test_options: {
         unit_test: true,
@@ -91,7 +95,7 @@
 
 rust_test {
     name: "downcast-rs_device_test_tests_use_via_namespace",
-    defaults: ["downcast-rs_defaults_downcast_rs"],
+    defaults: ["downcast-rs_test_defaults_downcast_rs"],
     srcs: ["tests/use_via_namespace.rs"],
 }
 
@@ -99,6 +103,8 @@
     name: "libdowncast_rs",
     host_supported: true,
     crate_name: "downcast_rs",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.2.0",
     srcs: ["src/lib.rs"],
     edition: "2015",
     features: [
@@ -107,6 +113,7 @@
     ],
     apex_available: [
         "//apex_available:platform",
+        "com.android.compos",
         "com.android.virt",
     ],
 }

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index ac56e26..a4a2e17 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,6 +1,7 @@
 {
   "apex-available": [
     "//apex_available:platform",
+    "com.android.compos",
     "com.android.virt"
   ],
   "dependencies": true,