aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-23 13:14:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-23 13:14:20 +0000
commitba47883ce572199d2e133fbe6a2bdc0665f6ab91 (patch)
tree733df90168a5495c41be429dc3b1a5d12eb51f7e
parent3171c807554352b4f11798dcaf648661dd845c29 (diff)
parentc133dba13b1f55cecb0b473fd71728f9db8f0d4d (diff)
downloadargh_shared-ba47883ce572199d2e133fbe6a2bdc0665f6ab91.tar.gz
Migrate to cargo_embargo. am: f516a00dd9 am: c133dba13b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/argh_shared/+/2799193 Change-Id: Ib5dafb529556060494f651c849671941ba86d06d 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.json11
3 files changed, 13 insertions, 13 deletions
diff --git a/Android.bp b/Android.bp
index 81f57ce..f6e84fa 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 {
@@ -26,9 +26,7 @@ rust_library {
cargo_pkg_version: "0.1.12",
srcs: ["src/lib.rs"],
edition: "2018",
- rustlibs: [
- "libserde",
- ],
+ rustlibs: ["libserde"],
apex_available: [
"//apex_available:platform",
"com.android.virt",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 6e516e0..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.virt"
- ],
- "device": true,
- "run": true,
- "tests": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..d5ca5d9
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,11 @@
+{
+ "tests": true,
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "module_blocklist": [
+ "argh_shared_test_src_lib"
+ ],
+ "run_cargo": false
+}