diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-10-18 18:17:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-18 18:17:54 +0000 |
| commit | 5a9d623ccc739f100cbe0e0f08594c451779a8d2 (patch) | |
| tree | 44f665f74d9c19ee7d0517b749edc8ddc1629970 | |
| parent | eb69adced3d3978e92e2121a1c7b87c449fd277d (diff) | |
| parent | 23655b59050e3217702d43ba9f517893ba544542 (diff) | |
| download | merge-5a9d623ccc739f100cbe0e0f08594c451779a8d2.tar.gz | |
Migrate to cargo_embargo. am: 23655b5905
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge/+/2796418
Change-Id: I4acdb1ed14955b0fa381b267b739403f617da428
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 | 4 | ||||
| -rw-r--r-- | cargo_embargo.json | 3 |
3 files changed, 5 insertions, 8 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 { @@ -32,9 +32,7 @@ rust_library { "num-traits", "std", ], - rustlibs: [ - "libnum_traits", - ], + rustlibs: ["libnum_traits"], proc_macros: ["libmerge_derive"], apex_available: [ "//apex_available:platform", diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 6e26a5a..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "device": true, - "run": true -} 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 +} |