aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-18 19:52:52 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-18 19:52:52 +0000
commit88d09a493025651828e2fa924f82dd55db6d9378 (patch)
tree6f026aabd28100d4c8bcf14785548dc9b0b78ac4
parentb96a79e5e284aa7fa97b8a7cebdcc4aa8105e022 (diff)
parent7beff799bd270a246e2726f04f0cc45f311b014f (diff)
downloadmacaddr-88d09a493025651828e2fa924f82dd55db6d9378.tar.gz
Migrate to cargo_embargo. am: a45f1d19a0 am: b351504a60 am: 7beff799bd
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/macaddr/+/2796279 Change-Id: Ic1c7908750c3abeecd1ca419b24a0e92ff696529 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json5
-rw-r--r--cargo_embargo.json7
3 files changed, 9 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp
index ae7d334..93130a4 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 {
@@ -49,9 +49,7 @@ rust_library {
"serde",
"std",
],
- rustlibs: [
- "libserde",
- ],
+ rustlibs: ["libserde"],
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 456ff71..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "device": true,
- "features": "serde,std",
- "run": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..4af1a9a
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,7 @@
+{
+ "features": [
+ "serde",
+ "std"
+ ],
+ "run_cargo": false
+}