aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-21 01:01:27 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-21 01:01:27 +0000
commitea2d03e0a6291070291814af797086f765273760 (patch)
treef4fa6f9d4b20c969aded7412bf0fa4f12f8765dd
parentad79a281c3dbd1cebacfc93d71c5a0fb0850b67b (diff)
parent869574c8e06151d7c539adc5c2d464a31ed254e7 (diff)
downloadremove_dir_all-ea2d03e0a6291070291814af797086f765273760.tar.gz
Migrate to cargo_embargo. am: ddc3319d6f am: 869574c8e0
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/remove_dir_all/+/2838275 Change-Id: I45d9fc0d3b77c273f51a6a82c90d40bf98424248 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json9
-rw-r--r--cargo_embargo.json7
3 files changed, 9 insertions, 13 deletions
diff --git a/Android.bp b/Android.bp
index fa7c77b..e9cfd8f 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 {
@@ -47,9 +47,7 @@ rust_library {
cargo_pkg_version: "0.7.1",
srcs: ["src/lib.rs"],
edition: "2018",
- rustlibs: [
- "liblibc",
- ],
+ rustlibs: ["liblibc"],
apex_available: [
"//apex_available:platform",
"com.android.virt",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 42b7833..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.virt"
- ],
- "dependencies": true,
- "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..fbb9fcd
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,7 @@
+{
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "run_cargo": false
+}