Snap for 7325096 from e2a98307c4ab7f16acffaa467038291227ff12eb to sc-d1-release
Change-Id: I06157408d57eed2441e2f0ab37f087076832266d
diff --git a/Android.bp b/Android.bp
index 209c553..7af1a94 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --device --dependencies.
+// This file is generated by cargo2android.py --config cargo2android.json.
+// Do not modify this file as changes will be overridden on upgrade.
package {
default_applicable_licenses: ["external_rust_crates_serde_json_license"],
@@ -47,9 +48,7 @@
"default",
"std",
],
- flags: [
- "--cfg limb_width_64",
- ],
+ cfgs: ["limb_width_64"],
rustlibs: [
"libitoa",
"libryu",
@@ -63,10 +62,10 @@
// dependent_library ["feature_list"]
// itoa-0.4.7
-// proc-macro2-1.0.24 "default,proc-macro"
-// quote-1.0.8 "default,proc-macro"
+// proc-macro2-1.0.26 "default,proc-macro"
+// quote-1.0.9 "default,proc-macro"
// ryu-1.0.5
-// serde-1.0.123 "default,derive,serde_derive,std"
-// serde_derive-1.0.123 "default"
-// syn-1.0.60 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
+// serde-1.0.125 "default,derive,serde_derive,std"
+// serde_derive-1.0.125 "default"
+// syn-1.0.71 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
// unicode-xid-0.2.1 "default"
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..42b7833
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,9 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "dependencies": true,
+ "device": true,
+ "run": true
+}
\ No newline at end of file
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
deleted file mode 100644
index 01eddb2..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 11e3e28..173735d 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -18,6 +18,10 @@ rust_library {
- "libryu",
- "libserde",
- ],
-+ apex_available: [
-+ "//apex_available:platform",
-+ "com.android.virt",
-+ ],
- }
-
- // dependent_library ["feature_list"]
