aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-15 21:53:22 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-15 21:53:22 +0000
commitea0e272b4185a6a142e6467bfdc3033950644bfd (patch)
tree85139f1b82c2faafd8a63666ae9ef954d0e7eeb6
parent894dd638d9b2e2073280f6c1fd4113f03c3e612a (diff)
parent8754f9d289558de21c089d1d45bea8b01943339c (diff)
downloadserde_test-ea0e272b4185a6a142e6467bfdc3033950644bfd.tar.gz
Migrate to cargo_embargo. am: 69e021eafc am: 5d1130c020 am: 8754f9d289
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_test/+/2832577 Change-Id: I1f912e301e6105a947d5448148c57904dad1419f 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.json3
3 files changed, 5 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp
index 6b4de9e..179cac3 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 {
@@ -46,9 +46,7 @@ rust_library {
cargo_pkg_version: "1.0.158",
srcs: ["src/lib.rs"],
edition: "2015",
- 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 d36fb44..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "device": true,
- "run": true,
- "tests": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..cb908d7
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,3 @@
+{
+ "run_cargo": false
+}