Remove patch.
Use a new feature in cargo2android.py instead of a patch.
Test: Run cargo2android.py.
Test: Build.
Change-Id: I7b4052bc7f370f1e75020f3d0c4e1a825e5d0f47
diff --git a/Android.bp b/Android.bp
index fac45b8..8dd0766 100644
--- a/Android.bp
+++ b/Android.bp
@@ -64,7 +64,6 @@
"range_inclusive",
"serde_derive",
"std_atomic",
- // "std_atomic64", // not for arm/arm64
"systemtime_checked_add",
],
proc_macros: ["libserde_derive"],
@@ -75,7 +74,7 @@
}
// dependent_library ["feature_list"]
-// proc-macro2-1.0.26 "default,proc-macro"
+// proc-macro2-1.0.27 "default,proc-macro"
// quote-1.0.9 "default,proc-macro"
// serde_derive-1.0.126 "default"
// syn-1.0.72 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
diff --git a/cargo2android.json b/cargo2android.json
index 4e40fcb..528d432 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -3,9 +3,11 @@
"//apex_available:platform",
"com.android.virt"
],
+ "cfg-blocklist": [
+ "std_atomic64"
+ ],
"dependencies": true,
"device": true,
"features": "default,derive",
- "patch": "patches/Android.bp.patch",
"run": true
}
\ No newline at end of file
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
deleted file mode 100644
index 071947f..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git b/Android.bp a/Android.bp
-index 41d67cc..277296f 100644
---- b/Android.bp
-+++ a/Android.bp
-@@ -64,7 +64,7 @@
- "range_inclusive",
- "serde_derive",
- "std_atomic",
-- "std_atomic64",
-+ // "std_atomic64", // not for arm/arm64
- "systemtime_checked_add",
- ],
- proc_macros: ["libserde_derive"],
