diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-17 02:58:16 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-17 02:58:16 +0000 |
commit | 16635795b8b741fb87cbc4cdf2d27fbd811d9143 (patch) | |
tree | ae82a5a3686f2251b57f2233f4df5f7d8b04018e | |
parent | 024ed02e827e9f6d7c7c6cf750a564397fcc298a (diff) | |
parent | d5f9539c234d48764d8baa685d3e71e7fb6aca7d (diff) | |
download | rand_xorshift-android13-frc-media-swcodec-release.tar.gz |
Snap for 8191477 from d5f9539c234d48764d8baa685d3e71e7fb6aca7d to tm-frc-media-swcodec-releaset_frc_swc_330443040t_frc_swc_330443010android13-frc-media-swcodec-release
Change-Id: Id9540a4fe58ee3a43a03c363111eacc3ed335ab9
-rw-r--r-- | Android.bp | 55 | ||||
-rw-r--r-- | TEST_MAPPING | 15 | ||||
-rw-r--r-- | cargo2android.json | 9 | ||||
-rw-r--r-- | patches/Android.bp.patch | 24 |
4 files changed, 31 insertions, 72 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --run --device --tests --dependencies --patch=patches/Android.bp.patch. +// This file is generated by cargo2android.py --config cargo2android.json. +// Do not modify this file as changes will be overridden on upgrade. package { default_applicable_licenses: ["external_rust_crates_rand_xorshift_license"], @@ -41,6 +42,8 @@ rust_library { name: "librand_xorshift", host_supported: true, crate_name: "rand_xorshift", + cargo_env_compat: true, + cargo_pkg_version: "0.3.0", srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ @@ -48,57 +51,21 @@ rust_library { ], } -rust_defaults { - name: "rand_xorshift_defaults", - crate_name: "rand_xorshift", - srcs: ["src/lib.rs"], - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2018", - rustlibs: [ - // ANDROID: not really used - //"libbincode", - "librand_core", - ], -} - -rust_test_host { - name: "rand_xorshift_host_test_src_lib", - defaults: ["rand_xorshift_defaults"], -} - rust_test { - name: "rand_xorshift_device_test_src_lib", - defaults: ["rand_xorshift_defaults"], -} - -rust_defaults { - name: "rand_xorshift_defaults_mod", + name: "rand_xorshift_test_tests_mod", + host_supported: true, crate_name: "mod", + cargo_env_compat: true, + cargo_pkg_version: "0.3.0", srcs: ["tests/mod.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", rustlibs: [ - // ANDROID: not really used - //"libbincode", "librand_core", "librand_xorshift", ], } - -rust_test_host { - name: "rand_xorshift_host_test_tests_mod", - defaults: ["rand_xorshift_defaults_mod"], -} - -rust_test { - name: "rand_xorshift_device_test_tests_mod", - defaults: ["rand_xorshift_defaults_mod"], -} - -// dependent_library ["feature_list"] -// bincode-1.3.1 -// byteorder-1.3.4 "default,std" -// rand_core-0.6.0 -// serde-1.0.118 "default,std" diff --git a/TEST_MAPPING b/TEST_MAPPING index c30a7b6..ae94940 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,11 +1,18 @@ -// Generated by cargo2android.py for tests in Android.bp +// Generated by update_crate_tests.py for tests that depend on this crate. { + "imports": [ + { + "path": "external/rust/crates/ryu" + } + ], "presubmit": [ { - "name": "rand_xorshift_device_test_src_lib" - }, + "name": "rand_xorshift_test_tests_mod" + } + ], + "presubmit-rust": [ { - "name": "rand_xorshift_device_test_tests_mod" + "name": "rand_xorshift_test_tests_mod" } ] } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..cf692e4 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,9 @@ +{ + "dependencies": true, + "dependency-blocklist": [ + "bincode" + ], + "device": true, + "run": true, + "tests": true +}
\ No newline at end of file diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch deleted file mode 100644 index 13b71ce..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 704654e..0e6db92 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -19,7 +19,8 @@ rust_defaults { - auto_gen_config: true, - edition: "2018", - rustlibs: [ -- "libbincode", -+ // ANDROID: not really used -+ //"libbincode", - "librand_core", - ], - } -@@ -42,7 +43,8 @@ rust_defaults { - auto_gen_config: true, - edition: "2018", - rustlibs: [ -- "libbincode", -+ // ANDROID: not really used -+ //"libbincode", - "librand_core", - "librand_xorshift", - ], |