diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-09 15:55:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-09 15:55:31 +0000 |
| commit | 04e7a2b4d313bd261d0fa126099451c011e0b0f2 (patch) | |
| tree | cc45dd741041014d3ed158ff611a4e889ba4209e | |
| parent | 73b54fdc1e6e2b54860ed217b3a269e9264ab3e4 (diff) | |
| parent | ac4db08d5a51703c613b7a88404d896448315c28 (diff) | |
| download | spin-04e7a2b4d313bd261d0fa126099451c011e0b0f2.tar.gz | |
Merge "Android.bp: add tests" am: d5ebf60999 am: ac4db08d5a
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/spin/+/1517949
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I71b85b6c5e39ea4c4029b2befea01d8780cd8f4e
| -rw-r--r-- | Android.bp | 28 | ||||
| -rw-r--r-- | TEST_MAPPING | 12 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 20 |
3 files changed, 58 insertions, 2 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --device --run --dependencies. +// This file is generated by cargo2android.py --run --device --dependencies --tests --patch=patches/Android.bp.patch. rust_library { name: "libspin", @@ -8,7 +8,31 @@ rust_library { edition: "2015", features: [ "default", + "std", "ticket_mutex", - "std", ], } + +rust_defaults { + name: "spin_defaults", + crate_name: "spin", + srcs: ["src/lib.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, + edition: "2015", + features: [ + "default", + "std", + "ticket_mutex", + ], +} + +rust_test_host { + name: "spin_host_test_src_lib", + defaults: ["spin_defaults"], +} + +rust_test { + name: "spin_device_test_src_lib", + defaults: ["spin_defaults"], +} diff --git a/TEST_MAPPING b/TEST_MAPPING new file mode 100644 index 0000000..6e9bd8c --- /dev/null +++ b/TEST_MAPPING @@ -0,0 +1,12 @@ +// Generated by cargo2android.py for tests in Android.bp +{ + "presubmit": [ + { + "host": true, + "name": "spin_host_test_src_lib" + }, + { + "name": "spin_device_test_src_lib" + } + ] +} diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch new file mode 100644 index 0000000..db27b2e --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,20 @@ +diff --git a/Android.bp b/Android.bp +index 96531ab..43db8ef 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -8,6 +8,7 @@ rust_library { + edition: "2015", + features: [ + "default", ++ "std", + "ticket_mutex", + ], + } +@@ -21,6 +22,7 @@ rust_defaults { + edition: "2015", + features: [ + "default", ++ "std", + "ticket_mutex", + ], + } |