diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-11 16:30:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-11 16:30:34 +0000 |
| commit | f6096561f65a332eeff647a3c862291ecc2ee53e (patch) | |
| tree | f6b51bef69599bc01dc14d9e0d89ebb72eef722d | |
| parent | 30bacb0b7e199117540ddef886e756e6a43e4b01 (diff) | |
| parent | e8a05f8b22cf3f52d8d2f17420ab1ac343c95f0f (diff) | |
| download | heck-f6096561f65a332eeff647a3c862291ecc2ee53e.tar.gz | |
Merge "Migrate to cargo_embargo." into main am: e8a05f8b22
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/heck/+/2862128
Change-Id: Iab18ca38a5ef8106fe7ba15c3a6194586ec56bc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | 0.3.3/Android.bp | 12 | ||||
| -rw-r--r-- | 0.3.3/cargo2android.json | 6 | ||||
| -rw-r--r-- | 0.3.3/cargo_embargo.json | 9 |
3 files changed, 14 insertions, 13 deletions
diff --git a/0.3.3/Android.bp b/0.3.3/Android.bp index 65601b5..063d0c2 100644 --- a/0.3.3/Android.bp +++ b/0.3.3/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 { @@ -50,9 +50,7 @@ rust_test { unit_test: true, }, edition: "2018", - rustlibs: [ - "libunicode_segmentation", - ], + rustlibs: ["libunicode_segmentation"], } rust_library { @@ -63,7 +61,7 @@ rust_library { cargo_pkg_version: "0.3.3", srcs: ["src/lib.rs"], edition: "2018", - rustlibs: [ - "libunicode_segmentation", - ], + rustlibs: ["libunicode_segmentation"], + product_available: true, + vendor_available: true, } diff --git a/0.3.3/cargo2android.json b/0.3.3/cargo2android.json deleted file mode 100644 index 8b712d9..0000000 --- a/0.3.3/cargo2android.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "device": true, - "run": true, - "tests": true, - "name-suffix": "_deprecated" -} diff --git a/0.3.3/cargo_embargo.json b/0.3.3/cargo_embargo.json new file mode 100644 index 0000000..5e90c3d --- /dev/null +++ b/0.3.3/cargo_embargo.json @@ -0,0 +1,9 @@ +{ + "apex_available": [], + "module_name_overrides": { + "heck_test_src_lib": "heck_test_src_lib_deprecated", + "libheck": "libheck_deprecated" + }, + "run_cargo": false, + "tests": true +} |