aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-08 22:04:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-08 22:04:31 +0000
commit2d2e4b908162b8bc3d828bfd65c621c5afb272ac (patch)
tree9da7d0ba8ba80a15af9e179f94ff7e95a40e4454
parentf38fd5f98bbfa8cf90f22d6a3f60c91058a0686f (diff)
parente041536c08332464ed41ab972ffa34c6c9a629c5 (diff)
downloadder_derive-2d2e4b908162b8bc3d828bfd65c621c5afb272ac.tar.gz
Migrate to cargo_embargo. am: 859cad91f2 am: e041536c08
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/der_derive/+/2822152 Change-Id: I813a885e6b29384bdc8033a56a9b6941c4ebc47c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json7
-rw-r--r--cargo_embargo.json12
3 files changed, 13 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index d5d0b99..ba5621e 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 {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index e8154a6..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "host-first-multilib": true,
- "run": true,
- "dep-suffixes": {
- "syn": "_deprecated"
- }
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..5e1c824
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,12 @@
+{
+ "module_name_overrides": {
+ "libsyn": "libsyn_deprecated"
+ },
+ "package": {
+ "der_derive": {
+ "device_supported": false,
+ "host_first_multilib": true
+ }
+ },
+ "run_cargo": false
+}