Snap for 7325096 from 08507275f7b443865837f78415642365450dfd70 to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-release

Change-Id: Ic717d85c69b0a219cffc672cc3368cef5a707c01

3 files changed, 29 insertions, 13 deletions

diff --git a/Android.bp b/Android.bp
index eeadd39..21bff56 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --tests --patch=patches/Android.bp.diff.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..929451a
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,12 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.resolv",
+    "com.android.virt"
+  ],
+  "device": true,
+  "min-sdk-version": "29",
+  "patch": "patches/Android.bp.diff",
+  "run": true,
+  "tests": true
+}
\ No newline at end of file
diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
index 213237d..e07e725 100644
--- a/patches/Android.bp.diff
+++ b/patches/Android.bp.diff
@@ -2,7 +2,22 @@ diff --git a/Android.bp b/Android.bp
 index 5033c27..843fa1c 100644
 --- a/Android.bp
 +++ b/Android.bp
-@@ -71,23 +71,6 @@ rust_defaults {
+@@ -45,9 +45,6 @@
+     test_suites: ["general-tests"],
+     auto_gen_config: true,
+     edition: "2015",
+-    rustlibs: [
+-        "libdoc_comment",
+-    ],
+ }
+ 
+ rust_test_host {
+@@ -70,28 +67,10 @@
+     auto_gen_config: true,
+     edition: "2015",
+     rustlibs: [
+-        "libdoc_comment",
+         "liblazy_static",
      ],
  }
  
@@ -26,14 +41,3 @@ index 5033c27..843fa1c 100644
  rust_test_host {
      name: "lazy_static_host_test_tests_test",
      defaults: ["lazy_static_defaults_lazy_static"],
-@@ -112,4 +95,9 @@ rust_library {
-     crate_name: "lazy_static",
-     srcs: ["src/lib.rs"],
-     edition: "2015",
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.resolv",
-+        "com.android.virt",
-+    ],
-+    min_sdk_version: "29",
- }