aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-09 01:22:55 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-09 01:22:55 +0000
commiteab417ce7556e22a8a6b6b84b111bac68099c21e (patch)
treeaaa0209fe40c9ef15bfe9cc5f3c35d633efc312e
parent62884e502a4d24cefc135591ef2be0f50e4ed593 (diff)
parent3742ab94f0761250d2e58f42e1d01f0d40b52dbf (diff)
downloadwhich-eab417ce7556e22a8a6b6b84b111bac68099c21e.tar.gz
Migrate to cargo_embargo. am: 3742ab94f0
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/which/+/2822243 Change-Id: I11eb28df1baa51b7f409c9c3df3d7f7355a2c3a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp3
-rw-r--r--cargo2android.json5
-rw-r--r--cargo_embargo.json4
3 files changed, 5 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp
index 22790af..155eace 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 {
@@ -20,7 +20,6 @@ license {
rust_library {
name: "libwhich",
- // has rustc warnings
host_supported: true,
crate_name: "which",
cargo_env_compat: true,
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 5fd6c55..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "device": true,
- "features": "",
- "run": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..b639cc5
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,4 @@
+{
+ "features": [],
+ "run_cargo": false
+}