aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-20 12:33:52 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-20 12:33:52 +0000
commita2a67fe35b3b3377b7247f07af94a9bf1c07b6ab (patch)
tree3a4660415d4837b742356ef16cefeef01027494a
parent50eaaee79669b14bb68d87a75d336283f2cc778f (diff)
parent30bacb0b7e199117540ddef886e756e6a43e4b01 (diff)
downloadheck-a2a67fe35b3b3377b7247f07af94a9bf1c07b6ab.tar.gz
Migrate to cargo_embargo. am: 5be076e383 am: 30bacb0b7e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/heck/+/2796417 Change-Id: Ic93f8d56b0ce1243538ae4354bc9e66c10df469d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp10
-rw-r--r--cargo2android.json6
-rw-r--r--cargo_embargo.json7
3 files changed, 10 insertions, 13 deletions
diff --git a/Android.bp b/Android.bp
index b3de44e..aff3f3f 100644
--- a/Android.bp
+++ b/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 {
@@ -54,9 +54,7 @@ rust_test {
"unicode",
"unicode-segmentation",
],
- rustlibs: [
- "libunicode_segmentation",
- ],
+ rustlibs: ["libunicode_segmentation"],
}
rust_library {
@@ -71,9 +69,7 @@ rust_library {
"unicode",
"unicode-segmentation",
],
- rustlibs: [
- "libunicode_segmentation",
- ],
+ rustlibs: ["libunicode_segmentation"],
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 5f2af9d..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "device": true,
- "run": true,
- "tests": true,
- "features": "unicode"
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..5fe28da
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,7 @@
+{
+ "tests": true,
+ "features": [
+ "unicode"
+ ],
+ "run_cargo": false
+}