diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:06:33 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:06:33 +0000 |
commit | 61d412dec2aed9178f000bba85ff0ca841f02349 (patch) | |
tree | da5af4c25982cdd1a71e123c4a76ab79436d1f7f | |
parent | 6e97ba51103855945b0e2c8d5e7665996d5aee0f (diff) | |
parent | 2b2ef406bbd4c4e1564ad82bf9d7be9e023bebb6 (diff) | |
download | rustc-hash-android13-mainline-ipsec-release.tar.gz |
Snap for 8570526 from 2b2ef406bbd4c4e1564ad82bf9d7be9e023bebb6 to mainline-ipsec-releaseaml_ips_331910010aml_ips_331312000aml_ips_331310000aml_ips_331111030aml_ips_331014020android13-mainline-ipsec-release
Change-Id: I6ef9c949412089eaa206457876d24f50e6ad6911
-rw-r--r-- | Android.bp | 28 | ||||
-rw-r--r-- | TEST_MAPPING | 19 | ||||
-rw-r--r-- | cargo2android.json | 5 |
3 files changed, 25 insertions, 27 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --run --dependencies --device --tests. +// 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_rustc-hash_license"], @@ -40,6 +41,8 @@ rust_library { name: "librustc_hash", host_supported: true, crate_name: "rustc_hash", + cargo_env_compat: true, + cargo_pkg_version: "1.1.0", srcs: ["src/lib.rs"], edition: "2015", features: [ @@ -47,26 +50,3 @@ rust_library { "std", ], } - -rust_defaults { - name: "rustc-hash_defaults", - crate_name: "rustc_hash", - srcs: ["src/lib.rs"], - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2015", - features: [ - "default", - "std", - ], -} - -rust_test_host { - name: "rustc-hash_host_test_src_lib", - defaults: ["rustc-hash_defaults"], -} - -rust_test { - name: "rustc-hash_device_test_src_lib", - defaults: ["rustc-hash_defaults"], -} diff --git a/TEST_MAPPING b/TEST_MAPPING index 31eb554..e4ec3b3 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,11 +1,24 @@ -// 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/libsqlite3-sys" + } + ], "presubmit": [ { - "name": "rustc-hash_device_test_src_lib" + "name": "keystore2_test" + }, + { + "name": "legacykeystore_test" + } + ], + "presubmit-rust": [ + { + "name": "keystore2_test" }, { - "name": "libsqlite3-sys_device_test_src_lib" + "name": "legacykeystore_test" } ] } 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 |