Snap for 8730993 from 3699735a4088fef441f1308b671984a0352c7ecb to mainline-tzdata3-release
Change-Id: I1936155f419074973df1ba2f4f3d1edf7f36f27e
diff --git a/Android.bp b/Android.bp
index 7feffa5..ce06234 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 --features=serde,std,v1.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -42,23 +42,17 @@
name: "libuuid",
host_supported: true,
crate_name: "uuid",
- cargo_env_compat: true,
- cargo_pkg_version: "0.8.2",
srcs: ["src/lib.rs"],
edition: "2018",
features: [
- "getrandom",
"serde",
"std",
"v1",
- "v4",
],
rustlibs: [
- "libgetrandom",
"libserde",
],
- apex_available: [
- "//apex_available:platform",
- "com.android.virt",
- ],
}
+
+// dependent_library ["feature_list"]
+// serde-1.0.124 "default,std"
diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index 4756a6c..0000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,25 +0,0 @@
-// Generated by update_crate_tests.py for tests that depend on this crate.
-{
- "presubmit": [
- {
- "name": "apkdmverity.test"
- },
- {
- "name": "microdroid_manager_test"
- },
- {
- "name": "virtualizationservice_device_test"
- }
- ],
- "presubmit-rust": [
- {
- "name": "apkdmverity.test"
- },
- {
- "name": "microdroid_manager_test"
- },
- {
- "name": "virtualizationservice_device_test"
- }
- ]
-}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 21b1d6c..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.virt"
- ],
- "dependencies": true,
- "device": true,
- "features": "serde,std,v1,v4",
- "run": true
-}
\ No newline at end of file
