Snap for 8061476 from 99f8d26e337b464108bbc51fb66083a6d2c9515e to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r9android-platform-13.0.0_r8android-platform-13.0.0_r7android-platform-13.0.0_r6android-platform-13.0.0_r5android-platform-13.0.0_r4android-platform-13.0.0_r3android-platform-13.0.0_r2android-platform-13.0.0_r19android-platform-13.0.0_r18android-platform-13.0.0_r17android-platform-13.0.0_r16android-platform-13.0.0_r15android-platform-13.0.0_r14android-platform-13.0.0_r13android-platform-13.0.0_r12android-platform-13.0.0_r11android-platform-13.0.0_r10android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-platform-releaseandroid13-gsi

Change-Id: Ief8c116fe87f23ca65768c4b7f738551c88b067b

3 files changed, 1 insertions, 20 deletions

diff --git a/Android.bp b/Android.bp
index 43c3c35..eca2f62 100644
--- a/Android.bp
+++ b/Android.bp
@@ -83,8 +83,6 @@ rust_test {
     ],
     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 ea92969..6dee77b 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -5,7 +5,7 @@
   ],
   "copy-out": true,
   "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 669a5e8..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 8e11707..a156cb8 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -62,9 +62,11 @@ rust_test {
-     ],
-     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: "2018",
-     rustlibs: [
-