Snap for 8730993 from d8744d30776aa5683a195ce032842177968d269f to mainline-tzdata3-release
Change-Id: I8efc69b3214e642469d9ab136ce29a1fbae1ddf1
diff --git a/Android.bp b/Android.bp
index fe1cd25..10e72a6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
-// Do not modify this file as changes will be overridden on upgrade.
+// This file is generated by cargo2android.py --run --dependencies --device.
package {
default_applicable_licenses: ["external_rust_crates_lazycell_license"],
@@ -37,29 +36,10 @@
],
}
-rust_test {
- name: "lazycell_test_src_lib",
- // has rustc warnings
- host_supported: true,
- crate_name: "lazycell",
- cargo_env_compat: true,
- cargo_pkg_version: "1.3.0",
- srcs: ["src/lib.rs"],
- test_suites: ["general-tests"],
- auto_gen_config: true,
- test_options: {
- unit_test: true,
- },
- edition: "2015",
-}
-
rust_library {
name: "liblazycell",
- // has rustc warnings
host_supported: true,
crate_name: "lazycell",
- cargo_env_compat: true,
- cargo_pkg_version: "1.3.0",
srcs: ["src/lib.rs"],
edition: "2015",
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index ff34c26..6716814 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,30 +1,8 @@
-// Generated by update_crate_tests.py for tests that depend on this crate.
+// Generated by cargo2android.py for tests in Android.bp
{
- "imports": [
- {
- "path": "external/rust/crates/libsqlite3-sys"
- }
- ],
"presubmit": [
{
- "name": "keystore2_test"
- },
- {
- "name": "lazycell_test_src_lib"
- },
- {
- "name": "legacykeystore_test"
- }
- ],
- "presubmit-rust": [
- {
- "name": "keystore2_test"
- },
- {
- "name": "lazycell_test_src_lib"
- },
- {
- "name": "legacykeystore_test"
+ "name": "libsqlite3-sys_device_test_src_lib"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index d36fb44..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "device": true,
- "run": true,
- "tests": true
-}
\ No newline at end of file
