Snap for 8730993 from 2329af6623fd0d0f9e687f1415e2549aa492b58a to mainline-tzdata3-releaseaml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010

Change-Id: Ib87df5e89475575d60cbc897b7a92bf5ed23e312

2 files changed, 9 insertions, 8 deletions

diff --git a/Android.bp b/Android.bp
index d7d879b..7430a0f 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.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -41,8 +41,6 @@ rust_library {
     name: "libmacaddr",
     host_supported: true,
     crate_name: "macaddr",
-    cargo_env_compat: true,
-    cargo_pkg_version: "1.0.1",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: [
@@ -53,3 +51,11 @@ rust_library {
         "libserde",
     ],
 }
+
+// dependent_library ["feature_list"]
+//   proc-macro2-1.0.24 "default,proc-macro"
+//   quote-1.0.9 "default,proc-macro"
+//   serde-1.0.124 "derive,serde_derive"
+//   serde_derive-1.0.124 "default"
+//   syn-1.0.64 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
+//   unicode-xid-0.2.1 "default"
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 456ff71..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "device": true,
-  "features": "serde,std",
-  "run": true
-}
\ No newline at end of file