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 | a8eb09c1b831db97a260af30a919a35cf1b90d36 (patch) | |
tree | d746b4081f4687579a930382b66f77fd68f6be6e | |
parent | 4f5918f33146bbcb916dc0ddbeacb2e59beeee0d (diff) | |
parent | e2f0634cc7b82c589e062b5ccac69eac2e18bff2 (diff) | |
download | heck-android-s-qpr3-beta-1.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
-rw-r--r-- | Android.bp | 30 | ||||
-rw-r--r-- | TEST_MAPPING | 18 | ||||
-rw-r--r-- | cargo2android.json | 5 |
3 files changed, 27 insertions, 26 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --tests --dependencies. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -37,41 +37,33 @@ license { ], } -rust_defaults { - name: "heck_defaults", +rust_test { + name: "heck_test_src_lib", + host_supported: true, crate_name: "heck", + cargo_env_compat: true, + cargo_pkg_version: "0.3.3", srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", rustlibs: [ "libunicode_segmentation", ], } -rust_test_host { - name: "heck_host_test_src_lib", - defaults: ["heck_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "heck_device_test_src_lib", - defaults: ["heck_defaults"], -} - rust_library { name: "libheck", host_supported: true, crate_name: "heck", + cargo_env_compat: true, + cargo_pkg_version: "0.3.3", srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ "libunicode_segmentation", ], } - -// dependent_library ["feature_list"] -// unicode-segmentation-1.7.1 diff --git a/TEST_MAPPING b/TEST_MAPPING index 5dacebd..af9eb77 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,20 +1,24 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { + "imports": [ + { + "path": "external/rust/crates/base64" + } + ], "presubmit": [ { "name": "authfs_device_test_src_lib" }, { - "name": "base64_device_test_tests_decode" - }, - { - "name": "base64_device_test_tests_encode" - }, + "name": "heck_test_src_lib" + } + ], + "presubmit-rust": [ { - "name": "base64_device_test_tests_helpers" + "name": "authfs_device_test_src_lib" }, { - "name": "heck_device_test_src_lib" + "name": "heck_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 |