diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-11 17:36:27 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-11 17:36:27 +0000 |
commit | dd54769da3575f5f705f7dfb871cc2e99a46ad7f (patch) | |
tree | f6b51bef69599bc01dc14d9e0d89ebb72eef722d | |
parent | b84982de836a0b577bd4c59e8490b37cdb6e91f0 (diff) | |
parent | 4451b85dc097e63bcab1d0b65d4203b56af34ec4 (diff) | |
download | heck-master.tar.gz |
Merge "Migrate to cargo_embargo." into main am: e8a05f8b22 am: f6096561f6 am: 4451b85dc0HEADmastermainemu-34-2-dev
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/heck/+/2862128
Change-Id: I5d5652a5c556c031b53f69ad86f416ce6568a371
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 +} |