diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-21 15:37:49 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-21 15:37:49 +0000 |
commit | 4f2bcb53ad33f07a488af856627c3e178461fdd5 (patch) | |
tree | 29d358317855f485f7f1c43f486288ac558196d6 | |
parent | 7405ff1bde70bf348708fd7cda2fc49fff1ddd1d (diff) | |
parent | baafe01a3318f1de562384fb38463838b0417099 (diff) | |
download | tokio-4f2bcb53ad33f07a488af856627c3e178461fdd5.tar.gz |
Migrate to cargo_embargo. am: 5db82bb93b am: 163791a2c4 am: baafe01a33
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/2838196
Change-Id: I12a45af902fe41c6cd17c4ac4774d6de05f2906f
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 | 15 | ||||
-rw-r--r-- | cargo_embargo.json | 38 |
3 files changed, 39 insertions, 17 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 { @@ -785,4 +785,3 @@ rust_test { unit_test: true, }, } - diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 123896c..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "add-toplevel-block": "cargo2android_tests.bp", - "device": true, - "min-sdk-version": "29", - "run": true, - "variants": [ - { - "features": "fs,io-util,macros,net,rt,rt-multi-thread,sync,time" - }, - { - "features": "fs,io-util,macros,net,rt,rt-multi-thread,sync,test-util,time", - "suffix": "_for_test" - } - ] -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..c517398 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,38 @@ +{ + "min_sdk_version": "29", + "package": { + "tokio": { + "add_toplevel_block": "cargo2android_tests.bp" + } + }, + "variants": [ + { + "features": [ + "fs", + "io-util", + "macros", + "net", + "rt", + "rt-multi-thread", + "sync", + "time" + ] + }, + { + "features": [ + "fs", + "io-util", + "macros", + "net", + "rt", + "rt-multi-thread", + "sync", + "test-util", + "time" + ], + "module_name_overrides": { + "libtokio": "libtokio_for_test" + } + } + ] +} |