commit cf2e04d7100cfc7c74956e58390bdce2d00b6e81
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Mar 27 18:08:30 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Mar 27 18:08:30 2023 +0000
tree d2dc707ff2472242590decf44975d26a67eaf8aa
parent 99545fc3f58ce517d5d3116d05b3d1876641dbd4
parent 9cf3eae71f4e455360642100f59a35ce016b4acf

Snap for 9829336 from 9cf3eae71f4e455360642100f59a35ce016b4acf to mainline-extservices-release

Change-Id: I3fe2e00e28ed51ef9fb3ee6af25b28ce70cbf38a

Android.bp

diff --git a/Android.bp b/Android.bp
index 5d9d629..01d60ff 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,15 +49,17 @@
     features: [
         "default",
         "derive",
+        "rc",
         "serde_derive",
         "std",
     ],
     proc_macros: ["libserde_derive"],
     apex_available: [
         "//apex_available:platform",
-        "com.android.virt",
+        "//apex_available:anyapex",
     ],
     vendor_available: true,
+    min_sdk_version: "29",
 }
 
 rust_test {
@@ -76,6 +78,7 @@
     features: [
         "default",
         "derive",
+        "rc",
         "serde_derive",
         "std",
     ],

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index 2a35106..a6c47ed 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,15 +1,15 @@
 {
   "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
+    "//apex_available:anyapex"
   ],
   "cfg-blocklist": [
     "std_atomic64"
   ],
   "dependencies": true,
   "device": true,
-  "features": "default,derive",
+  "features": "default,derive,rc",
   "run": true,
   "tests": true,
-  "vendor-available": true
-}
\ No newline at end of file
+  "vendor-available": true,
+  "min_sdk_version": "29"
+}