diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-10-19 12:54:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-19 12:54:30 +0000 |
| commit | b4f83899c6bf798407b652cab57fb6624a450166 (patch) | |
| tree | c44fc6b01071147b504ae253ee0d5d8c8cd6d285 | |
| parent | 3579d2dc58d7a53db954fba5a410bf07faeb4d72 (diff) | |
| parent | 6fd24aae900fa1bfcb815aba5a861b3d97cab7c3 (diff) | |
| download | either-b4f83899c6bf798407b652cab57fb6624a450166.tar.gz | |
Migrate to cargo_embargo. am: 6fd24aae90
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/either/+/2796179
Change-Id: Ib538e624b2414037409046e9a64d5f17886d423d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | cargo2android.json | 5 | ||||
| -rw-r--r-- | cargo_embargo.json | 4 |
3 files changed, 6 insertions, 9 deletions
@@ -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 { @@ -54,9 +54,7 @@ rust_test { "default", "use_std", ], - rustlibs: [ - "libserde_json", - ], + rustlibs: ["libserde_json"], } rust_library { 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..246281d --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,4 @@ +{ + "tests": true, + "run_cargo": false +} |