aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-18 18:52:18 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-18 18:52:18 +0000
commitdbb062662a7d8ff0c411883fda804343147728e0 (patch)
tree70a44b234f242e52091481c2f6c2777f6e3b615e
parente405885bab1fe30212b0348f7e8420cfa55ba840 (diff)
parent7a86dff6c439bf763a731333acaf371d1dbd634e (diff)
downloadargh-dbb062662a7d8ff0c411883fda804343147728e0.tar.gz
Migrate to cargo_embargo. am: 7a86dff6c4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/argh/+/2796293 Change-Id: I5727c4167d397d193c08af3a13a5fb2e8ac167d6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp8
-rw-r--r--cargo2android.json15
-rw-r--r--cargo_embargo.json17
3 files changed, 20 insertions, 20 deletions
diff --git a/Android.bp b/Android.bp
index 029b44a..21682b8 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 {
@@ -41,7 +41,7 @@ rust_test {
rust_test {
name: "argh_test_tests_lib",
host_supported: true,
- crate_name: "argh",
+ crate_name: "lib",
cargo_env_compat: true,
cargo_pkg_version: "0.1.10",
srcs: ["tests/lib.rs"],
@@ -67,9 +67,7 @@ rust_library {
cargo_pkg_version: "0.1.10",
srcs: ["src/lib.rs"],
edition: "2018",
- rustlibs: [
- "libargh_shared",
- ],
+ rustlibs: ["libargh_shared"],
proc_macros: ["libargh_derive"],
apex_available: [
"//apex_available:platform",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 1dd19e7..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.virt"
- ],
- "device": true,
- "run": true,
- "tests": true,
- "dependency-blocklist": [
- "trybuild"
- ],
- "test-blocklist": [
- "tests/compiletest.rs"
- ]
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..51eae9d
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,17 @@
+{
+ "tests": true,
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "package": {
+ "argh": {
+ "dep_blocklist": [
+ "libtrybuild"
+ ]
+ }
+ },
+ "module_blocklist": [
+ "argh_test_tests_compiletest"
+ ]
+}