diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-11-09 05:14:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-09 05:14:49 +0000 |
| commit | e4b89ac5f0f7c55f1ba55c27aeaa6cf77d4450f8 (patch) | |
| tree | 2d4aaaf10956674d6b3b13b6d46af1edbc7f3eba | |
| parent | ba7e0f1c222339a3befa8c1f8a61de7d0ac09292 (diff) | |
| parent | 8b2078f014a4c12f9dcf9acbfdc35ba778aeb7e7 (diff) | |
| download | atomic-e4b89ac5f0f7c55f1ba55c27aeaa6cf77d4450f8.tar.gz | |
Migrate to cargo_embargo. am: 2238257e7c am: 729af358d4 am: 8b2078f014
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/atomic/+/2822519
Change-Id: I7dc1a5a1d3a8f90efb25b5425da0f8ee0d2cdf03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | cargo2android.json | 6 | ||||
| -rw-r--r-- | cargo_embargo.json | 6 |
3 files changed, 7 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 { @@ -40,7 +40,6 @@ license { rust_library { name: "libatomic_rust", stem: "libatomic", - // has rustc warnings host_supported: true, crate_name: "atomic", cargo_env_compat: true, diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 8f47245..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "dependencies": true, - "device": true, - "features": "fallback,std", - "run": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..4b1cd3c --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,6 @@ +{ + "features": [ + "fallback", + "std" + ] +} |