Use new cargo2android.py feature to remove a patch. am: 9d31388ac4 am: 8018918c1b am: 4e371065d9 am: 4d8755b693
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vulkano/+/1943368
Change-Id: I52b0d43642315f4add4d211d9ad1a9c24515392b
diff --git a/Android.bp b/Android.bp
index 43c3c35..eca2f62 100644
--- a/Android.bp
+++ b/Android.bp
@@ -83,8 +83,6 @@
],
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: [
-
