Snap for 8730993 from dc83778ae30ab88216912b6417cffffc125bbb16 to mainline-tzdata3-release
Change-Id: I1184d65851dfb76cc1c7179a888629b93674e478
diff --git a/Android.bp b/Android.bp
index 850e6fd..290f0b5 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.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -41,8 +41,6 @@
name: "libtinytemplate",
host_supported: true,
crate_name: "tinytemplate",
- cargo_env_compat: true,
- cargo_pkg_version: "1.2.1",
srcs: ["src/lib.rs"],
edition: "2015",
rustlibs: [
@@ -51,23 +49,8 @@
],
}
-rust_test {
- name: "tinytemplate_test_src_lib",
- host_supported: true,
- crate_name: "tinytemplate",
- cargo_env_compat: true,
- cargo_pkg_version: "1.2.1",
- srcs: ["src/lib.rs"],
- test_suites: ["general-tests"],
- auto_gen_config: true,
- test_options: {
- unit_test: true,
- },
- edition: "2015",
- rustlibs: [
- "libcriterion",
- "libserde",
- "libserde_json",
- ],
- proc_macros: ["libserde_derive"],
-}
+// dependent_library ["feature_list"]
+// itoa-0.4.7 "default,std"
+// ryu-1.0.5
+// serde-1.0.125 "default,std"
+// serde_json-1.0.64 "default,std"
diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index 9a60ded..0000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,24 +0,0 @@
-// Generated by update_crate_tests.py for tests that depend on this crate.
-{
- "imports": [
- {
- "path": "external/rust/crates/base64"
- },
- {
- "path": "external/rust/crates/tinyvec"
- },
- {
- "path": "external/rust/crates/unicode-xid"
- }
- ],
- "presubmit": [
- {
- "name": "tinytemplate_test_src_lib"
- }
- ],
- "presubmit-rust": [
- {
- "name": "tinytemplate_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
