aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-04-01 02:01:10 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-04-01 02:01:10 +0000
commit4f03bdada7ffb140777d8016007591b643640ae9 (patch)
treed2dc707ff2472242590decf44975d26a67eaf8aa
parentdb1ba69cf481a3035c02157e0d76a9ee2e863614 (diff)
parent9cf3eae71f4e455360642100f59a35ce016b4acf (diff)
downloadserde-android13-mainline-art-release.tar.gz
Snap for 9867090 from 9cf3eae71f4e455360642100f59a35ce016b4acf to mainline-art-releaseaml_art_331813100aml_art_331813010android13-mainline-art-release
Change-Id: I8b1885d76e45d687004df0fc33e60737293e3274
-rw-r--r--Android.bp5
-rw-r--r--cargo2android.json10
2 files changed, 9 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index 5d9d629..01d60ff 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,15 +49,17 @@ rust_library {
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 @@ rust_test {
features: [
"default",
"derive",
+ "rc",
"serde_derive",
"std",
],
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"
+}