aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-09 01:20:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-09 01:20:58 +0000
commitd07aafe978c88aad2ce44dfb88619f0afdaf13c9 (patch)
tree768a7dfc88e1164daf13edb614bd2256c496d84b
parente2468322008fcbf5aa885a4328e981e5a438b399 (diff)
parentfe14e434be2eac262f872ad32996c4541a61b422 (diff)
downloadx509-parser-d07aafe978c88aad2ce44dfb88619f0afdaf13c9.tar.gz
Migrate to cargo_embargo. am: fe14e434be
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/x509-parser/+/2822773 Change-Id: Ia52acbf385f9303d686c3ed1f6ca32af4346a79d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp3
-rw-r--r--cargo2android.json11
-rw-r--r--cargo_embargo.json14
3 files changed, 15 insertions, 13 deletions
diff --git a/Android.bp b/Android.bp
index ec10a2b..d52e885 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo_embargo.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -39,7 +39,6 @@ license {
rust_library {
name: "libx509_parser",
- // has rustc warnings
host_supported: true,
crate_name: "x509_parser",
cargo_env_compat: true,
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index b0b6639..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.virt"
- ],
- "dependency-blocklist": [
- "data_encoding"
- ],
- "device": true,
- "run": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..b5493bc
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,14 @@
+{
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "package": {
+ "x509-parser": {
+ "dep_blocklist": [
+ "libdata_encoding"
+ ]
+ }
+ },
+ "run_cargo": false
+}