summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-08 21:27:14 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-08 21:27:14 +0000
commitf2e12c5b3fbc1b38c5f3fe95dd2e30c1580f7d94 (patch)
treeae8659336830661123d37042d9de1a0f39cd9906
parent55a2b1a6923728845f062003cfd072e30a91647b (diff)
parent60d782f8d6e915a3e6d857327866f86dd8e3bfa2 (diff)
downloadcexpr-f2e12c5b3fbc1b38c5f3fe95dd2e30c1580f7d94.tar.gz
Migrate to cargo_embargo. am: 02ad4c1108 am: 60d782f8d6
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/2822396 Change-Id: I9a88279364f8f48feb30cd929f44affa4c5970a0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json4
-rw-r--r--cargo_embargo.json3
3 files changed, 5 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index 09ee54e..5849f58 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 {
@@ -45,9 +45,7 @@ rust_library {
cargo_pkg_version: "0.6.0",
srcs: ["src/lib.rs"],
edition: "2018",
- rustlibs: [
- "libnom",
- ],
+ rustlibs: ["libnom"],
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index bf78496..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "device": true,
- "run": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..cb908d7
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,3 @@
+{
+ "run_cargo": false
+}