Remove patch.
Use a new cargo2android.py feature to remove a patch.
Test: Build
Change-Id: I7019390dc5ca8068fdfdcffd55cc43d4cdc46674
diff --git a/Android.bp b/Android.bp
index a1c4c87..8dc5819 100644
--- a/Android.bp
+++ b/Android.bp
@@ -87,7 +87,7 @@
"libspin",
"libuntrusted",
],
- static_libs: [
+ whole_static_libs: [
"libring-core",
"libring-test",
],
diff --git a/cargo2android.json b/cargo2android.json
index 27fbf76..6b36a3c 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -11,5 +11,8 @@
"min-sdk-version": "29",
"run": true,
"tests": true,
- "patch": "patches/whole_static_libs.patch"
-}
+ "whole-static-libs": [
+ "ring-core",
+ "ring-test"
+ ]
+}
\ No newline at end of file
diff --git a/patches/whole_static_libs.patch b/patches/whole_static_libs.patch
deleted file mode 100644
index cdc7da8..0000000
--- a/patches/whole_static_libs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Android.bp.orig 2021-07-13 05:18:27.737087081 +0900
-+++ Android.bp 2021-07-13 05:19:16.036656691 +0900
-@@ -54,7 +54,7 @@ rust_library {
- "libspin",
- "libuntrusted",
- ],
-- static_libs: [
-+ whole_static_libs: [
- "libring-core",
- "libring-test",
- ],
