Snap for 8730993 from 36a0cff108f41af4cfd8840429bf76b28ab906a4 to mainline-tzdata3-release
Change-Id: I1f6245d62467fca87ee59e4937b61eccb5faf501
diff --git a/Android.bp b/Android.bp
index 1cbd146..12d9f35 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo2android.py --run --device --dependencies --tests.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -37,18 +37,12 @@
],
}
-rust_test {
- name: "either_test_src_lib",
- host_supported: true,
+rust_defaults {
+ name: "either_defaults",
crate_name: "either",
- cargo_env_compat: true,
- cargo_pkg_version: "1.6.1",
srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
- test_options: {
- unit_test: true,
- },
edition: "2015",
features: [
"default",
@@ -59,12 +53,23 @@
],
}
+rust_test_host {
+ name: "either_host_test_src_lib",
+ defaults: ["either_defaults"],
+ test_options: {
+ unit_test: true,
+ },
+}
+
+rust_test {
+ name: "either_device_test_src_lib",
+ defaults: ["either_defaults"],
+}
+
rust_library {
name: "libeither",
host_supported: true,
crate_name: "either",
- cargo_env_compat: true,
- cargo_pkg_version: "1.6.1",
srcs: ["src/lib.rs"],
edition: "2015",
features: [
@@ -73,5 +78,8 @@
],
}
-//Non fatal errors:
-// error: test
+// dependent_library ["feature_list"]
+// itoa-0.4.7
+// ryu-1.0.5
+// serde-1.0.123 "std"
+// serde_json-1.0.64 "default,std"
diff --git a/TEST_MAPPING b/TEST_MAPPING
index de3ad0a..f95386d 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,54 +1,8 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
- "imports": [
- {
- "path": "external/rust/crates/base64"
- },
- {
- "path": "external/rust/crates/libsqlite3-sys"
- },
- {
- "path": "external/rust/crates/tinytemplate"
- },
- {
- "path": "external/rust/crates/tinyvec"
- },
- {
- "path": "external/rust/crates/unicode-xid"
- }
- ],
"presubmit": [
{
- "name": "apkdmverity.test"
- },
- {
- "name": "either_test_src_lib"
- },
- {
- "name": "keystore2_test"
- },
- {
- "name": "legacykeystore_test"
- },
- {
- "name": "microdroid_manager_test"
- }
- ],
- "presubmit-rust": [
- {
- "name": "apkdmverity.test"
- },
- {
- "name": "either_test_src_lib"
- },
- {
- "name": "keystore2_test"
- },
- {
- "name": "legacykeystore_test"
- },
- {
- "name": "microdroid_manager_test"
+ "name": "either_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
