Snap for 8061476 from 45a803cd8ce9c086bbaae921678acf7bd970b422 to tm-d1-releaseandroid-13.0.0_r9android-13.0.0_r15android-13.0.0_r14android-13.0.0_r13android-13.0.0_r11android-13.0.0_r10android13-d1-s3-releaseandroid13-d1-s2-releaseandroid13-d1-s1-releaseandroid13-d1-release

Change-Id: I7c396f1ffe48144e756649278faf55f3f481553c

3 files changed, 1 insertions, 20 deletions

diff --git a/Android.bp b/Android.bp
index 28ea619..71ece12 100644
--- a/Android.bp
+++ b/Android.bp
@@ -66,8 +66,6 @@ rust_test {
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
-    // Manually disabled as these tests depend on specific graphics libraries
-    // being available on the machine running the tests.
     test_options: {
         unit_test: false,
     },
diff --git a/cargo2android.json b/cargo2android.json
index bbea40c..6e68088 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -4,7 +4,7 @@
     "com.android.virt"
   ],
   "device": true,
-  "patch": "patches/Android.bp.patch",
+  "no-presubmit": true,
   "run": true,
   "tests": true
 }
\ No newline at end of file
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
deleted file mode 100644
index 32794df..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 3e82eff..550133f 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -35,9 +35,11 @@ rust_test {
-     srcs: ["src/lib.rs"],
-     test_suites: ["general-tests"],
-     auto_gen_config: true,
-+    // Manually disabled as these tests depend on specific graphics libraries
-+    // being available on the machine running the tests.
-     test_options: {
--        unit_test: true,
-+        unit_test: false,
-     },
-     edition: "2015",
-     rustlibs: [
-