aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Geisler <mgeisler@google.com>2023-02-14 10:15:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-14 10:15:57 +0000
commit3ae80c130632f0b34ff2c46bb02238ce8baa8fa1 (patch)
treee8a745f917714f798633c33acfd4e04cbd01c647
parent76d88ae41a7c3f1b368497e05c4febb3eea2b220 (diff)
parente434f1fe2e36df298a278fc45aaebca1d728518b (diff)
downloadserde-3ae80c130632f0b34ff2c46bb02238ce8baa8fa1.tar.gz
Merge "serde: make it available to any APEX" am: 92ae4e841e am: ab258e06d1 am: e434f1fe2e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde/+/2430703 Change-Id: I535cb5502c5f80ae63cc89224a27ae558f917325 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp3
-rw-r--r--cargo2android.json6
2 files changed, 5 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp
index 2b78545..a129ef0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -56,9 +56,10 @@ rust_library {
proc_macros: ["libserde_derive"],
apex_available: [
"//apex_available:platform",
- "com.android.virt",
+ "//apex_available:anyapex",
],
vendor_available: true,
+ min_sdk_version: "29",
}
rust_test {
diff --git a/cargo2android.json b/cargo2android.json
index fa7bf50..a6c47ed 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,7 +1,6 @@
{
"apex-available": [
- "//apex_available:platform",
- "com.android.virt"
+ "//apex_available:anyapex"
],
"cfg-blocklist": [
"std_atomic64"
@@ -11,5 +10,6 @@
"features": "default,derive,rc",
"run": true,
"tests": true,
- "vendor-available": true
+ "vendor-available": true,
+ "min_sdk_version": "29"
}