aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-10 16:32:40 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-10 16:32:40 +0000
commiteacdb1b32b0fc4e92408c9aa08ea42a440c5224f (patch)
treeef90139c1d1e0a903150e5e4b2ed24740974b2bf
parentd94cf14bdf45253ebe55f940fea30e3e862b795a (diff)
parent8fb69e73b30ba80c44ea03afe8e3538a8836d92c (diff)
downloadwalkdir-eacdb1b32b0fc4e92408c9aa08ea42a440c5224f.tar.gz
Migrate to cargo_embargo. am: 38de36256b am: 6765496a2c am: 8fb69e73b3
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/walkdir/+/2824630 Change-Id: I235ed8cf59f6eb7f9baae5dacc7556e0f70c0575 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 f22d6b6..6430519 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: "2.3.3",
srcs: ["src/lib.rs"],
edition: "2018",
- rustlibs: [
- "libsame_file",
- ],
+ rustlibs: ["libsame_file"],
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
+}