Use new cargo2android.py feature to remove a patch. am: eef57dbf37 am: 9c10e70c46 am: eeb6a09c88 am: 4f62bdccde
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/shared_library/+/1943944
Change-Id: I4eb4aaceb5db7333a6edebcfefaa1aeaa2f7988f
diff --git a/Android.bp b/Android.bp
index 28ea619..71ece12 100644
--- a/Android.bp
+++ b/Android.bp
@@ -66,8 +66,6 @@
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: [
-
