diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 15:28:00 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-12-15 15:28:00 +0000 |
commit | 554e9d1da7e786af0fd3a67464a0577d05bb2419 (patch) | |
tree | fcb1a58c331cc338a961249db2b8726b6c5f69ff | |
parent | c8f3e041eae2ef4572e6d6a2b2058670f93d5942 (diff) | |
parent | bdb436b736635f0d9cf43032232ae0391cf649f9 (diff) | |
download | gdbstub_arch-554e9d1da7e786af0fd3a67464a0577d05bb2419.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."
-rw-r--r-- | Android.bp | 25 | ||||
-rw-r--r-- | TEST_MAPPING | 7 | ||||
-rw-r--r-- | cargo2android.json | 5 |
3 files changed, 19 insertions, 18 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --device --run --tests. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -18,14 +18,18 @@ license { ], } -rust_defaults { - name: "gdbstub_arch_test_defaults", +rust_test { + name: "gdbstub_arch_test_src_lib", + host_supported: true, crate_name: "gdbstub_arch", - srcs: ["src/lib.rs"], cargo_env_compat: true, cargo_pkg_version: "0.1.1", + srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", rustlibs: [ "libgdbstub", @@ -33,19 +37,6 @@ rust_defaults { ], } -rust_test_host { - name: "gdbstub_arch_host_test_src_lib", - defaults: ["gdbstub_arch_test_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "gdbstub_arch_device_test_src_lib", - defaults: ["gdbstub_arch_test_defaults"], -} - rust_library { name: "libgdbstub_arch", host_supported: true, diff --git a/TEST_MAPPING b/TEST_MAPPING index 1e91e7e..571f133 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -2,7 +2,12 @@ { "presubmit": [ { - "name": "gdbstub_arch_device_test_src_lib" + "name": "gdbstub_arch_test_src_lib" + } + ], + "presubmit-rust": [ + { + "name": "gdbstub_arch_test_src_lib" } ] } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..d36fb44 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,5 @@ +{ + "device": true, + "run": true, + "tests": true +}
\ No newline at end of file |