commit b49906508c496c85c765373a45facb871932867b
author Joel Galenson <jgalenson@google.com> Tue Nov 09 16:28:15 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 09 16:28:15 2021 +0000
tree 1bdf2914c22444fbaef96bd738600bc53d0a1e28
parent 39ae5b5d3e2dfe53b0c61273422d5ce32612195e
parent e70f6bff080df3022364af29a0856bb5a69547d3

Add apex_available. am: 030e665e47 am: 76641df7be am: db1b76a7e3 am: e70f6bff08

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cfg-if/+/1874545

Change-Id: I83e8a420500782cf57654b92fca7118145c26287

Android.bp

diff --git a/Android.bp b/Android.bp
index b3e505f..a8c357f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -38,9 +38,11 @@
 }
 
 rust_defaults {
-    name: "cfg-if_defaults",
+    name: "cfg-if_test_defaults",
     crate_name: "cfg_if",
     srcs: ["src/lib.rs"],
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.0",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2018",
@@ -48,7 +50,7 @@
 
 rust_test_host {
     name: "cfg-if_host_test_src_lib",
-    defaults: ["cfg-if_defaults"],
+    defaults: ["cfg-if_test_defaults"],
     test_options: {
         unit_test: true,
     },
@@ -56,13 +58,15 @@
 
 rust_test {
     name: "cfg-if_device_test_src_lib",
-    defaults: ["cfg-if_defaults"],
+    defaults: ["cfg-if_test_defaults"],
 }
 
 rust_defaults {
-    name: "cfg-if_defaults_xcrate",
+    name: "cfg-if_test_defaults_xcrate",
     crate_name: "xcrate",
     srcs: ["tests/xcrate.rs"],
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.0",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2018",
@@ -73,7 +77,7 @@
 
 rust_test_host {
     name: "cfg-if_host_test_tests_xcrate",
-    defaults: ["cfg-if_defaults_xcrate"],
+    defaults: ["cfg-if_test_defaults_xcrate"],
     test_options: {
         unit_test: true,
     },
@@ -81,19 +85,22 @@
 
 rust_test {
     name: "cfg-if_device_test_tests_xcrate",
-    defaults: ["cfg-if_defaults_xcrate"],
+    defaults: ["cfg-if_test_defaults_xcrate"],
 }
 
 rust_library {
     name: "libcfg_if",
     host_supported: true,
     crate_name: "cfg_if",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.0",
     srcs: ["src/lib.rs"],
     edition: "2018",
     apex_available: [
         "//apex_available:platform",
         "com.android.compos",
         "com.android.resolv",
+        "com.android.uwb",
         "com.android.virt",
     ],
     min_sdk_version: "29",

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index 506d866..79cdb2e 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -3,6 +3,7 @@
     "//apex_available:platform",
     "com.android.compos",
     "com.android.resolv",
+    "com.android.uwb",
     "com.android.virt"
   ],
   "dependencies": true,