Snap for 7325096 from 0204cb5c5d9c814cdd7c49530ce51c921cd89c8f to sc-d1-release
Change-Id: Ida3e8239dd434bc6dfcee3b2d3e6a73a4c649544
diff --git a/Android.bp b/Android.bp
index 6916e0b..2284c8e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies --features=default,derive --patch=patches/Android.bp.patch.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -78,5 +78,5 @@
// proc-macro2-1.0.26 "default,proc-macro"
// quote-1.0.9 "default,proc-macro"
// serde_derive-1.0.125 "default"
-// syn-1.0.69 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
+// 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..4e40fcb
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,11 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "dependencies": true,
+ "device": true,
+ "features": "default,derive",
+ "patch": "patches/Android.bp.patch",
+ "run": true
+}
\ No newline at end of file
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index c124dc0..071947f 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -2,7 +2,7 @@
index 41d67cc..277296f 100644
--- b/Android.bp
+++ a/Android.bp
-@@ -64,10 +64,14 @@
+@@ -64,7 +64,7 @@
"range_inclusive",
"serde_derive",
"std_atomic",
@@ -11,10 +11,3 @@
"systemtime_checked_add",
],
proc_macros: ["libserde_derive"],
-+ apex_available: [
-+ "//apex_available:platform",
-+ "com.android.virt",
-+ ],
- }
-
- // dependent_library ["feature_list"]
