aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-14 21:31:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-14 21:31:49 +0000
commitcd7a06005afa08971da3001ab5fc1ba07374dbd7 (patch)
tree199870fc094fd7c0193faaa7f18e6f99a3aedbb4
parent012e46745a41829b09bb598d1638be2c6ad9c11f (diff)
parent5b084736ebf2a3791ae3ccbb08b3d9583a399d9b (diff)
downloadpin-utils-cd7a06005afa08971da3001ab5fc1ba07374dbd7.tar.gz
Migrate to cargo_embargo. am: e499062798 am: 70195fd776 am: 5b084736eb
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pin-utils/+/2828201 Change-Id: I086b77bd80c05aa6145fe9d7ac55795ef845660c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp31
-rw-r--r--cargo2android.json8
-rw-r--r--cargo_embargo.json4
3 files changed, 19 insertions, 24 deletions
diff --git a/Android.bp b/Android.bp
index 096603c..5cdb0a9 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 {
@@ -54,35 +54,34 @@ rust_library {
min_sdk_version: "29",
}
-rust_defaults {
- name: "pin-utils_test_defaults",
- crate_name: "pin_utils",
- cargo_env_compat: true,
- cargo_pkg_version: "0.1.0",
- test_suites: ["general-tests"],
- auto_gen_config: true,
- edition: "2018",
- rustlibs: [
- "libpin_utils",
- ],
-}
-
rust_test {
name: "pin-utils_test_tests_projection",
- defaults: ["pin-utils_test_defaults"],
host_supported: true,
+ crate_name: "projection",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.1.0",
srcs: ["tests/projection.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ rustlibs: ["libpin_utils"],
}
rust_test {
name: "pin-utils_test_tests_stack_pin",
- defaults: ["pin-utils_test_defaults"],
host_supported: true,
+ crate_name: "stack_pin",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.1.0",
srcs: ["tests/stack_pin.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ rustlibs: ["libpin_utils"],
}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index e9ed115..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "dependencies": true,
- "device": true,
- "min-sdk-version": "29",
- "vendor-available": true,
- "run": true,
- "tests": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..db1aaad
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,4 @@
+{
+ "min_sdk_version": "29",
+ "tests": true
+}