Snap for 7325276 from c9e1025196b802e60860ff6082cb78f7edb0aa9b to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r60android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-security-11.0.0_r71android-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-release

Change-Id: Ia545dfb735ba1e4e3ed56aa7e6a7de82f6e8515d

3 files changed, 25 insertions, 23 deletions

diff --git a/Android.bp b/Android.bp
index ae913ce..d53b9c9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --tests --dependencies --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 {
@@ -25,11 +25,12 @@ rust_library {
     srcs: ["src/lib.rs"],
     edition: "2015",
     features: ["default"],
-    flags: [
-        "--cfg allow_clippy",
-        "--cfg doctests",
-        "--cfg maybe_uninit",
-        "--cfg tuple_ty",
+    cfgs: [
+        "allow_clippy",
+        "doctests",
+        "maybe_uninit",
+        "raw_ref_macros",
+        "tuple_ty",
     ],
     apex_available: [
         "//apex_available:platform",
@@ -45,11 +46,12 @@ rust_defaults {
     auto_gen_config: true,
     edition: "2015",
     features: ["default"],
-    flags: [
-        "--cfg allow_clippy",
-        "--cfg doctests",
-        "--cfg maybe_uninit",
-        "--cfg tuple_ty",
+    cfgs: [
+        "allow_clippy",
+        "doctests",
+        "maybe_uninit",
+        "raw_ref_macros",
+        "tuple_ty",
     ],
     rustlibs: [
         // ANDROID: disable for now just to avoid another dependency.
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..0f253f0
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,11 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "dependencies": true,
+  "device": true,
+  "patch": "patches/Android.bp.patch",
+  "run": true,
+  "tests": true
+}
\ No newline at end of file
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index 76d4a07..96c3e12 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -2,18 +2,7 @@ diff --git a/Android.bp b/Android.bp
 index eb63f7c..efa8362 100644
 --- a/Android.bp
 +++ b/Android.bp
-@@ -13,6 +13,10 @@ rust_library {
-         "--cfg maybe_uninit",
-         "--cfg tuple_ty",
-     ],
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.virt",
-+    ],
- }
- 
- rust_defaults {
-@@ -30,7 +34,8 @@ rust_defaults {
+@@ -48,7 +52,8 @@ rust_defaults {
          "--cfg tuple_ty",
      ],
      rustlibs: [