Generate apex_available from c2a instead of a patch am: b7aefdc050 am: a172325fac
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/unicode-bidi/+/1688683
Change-Id: Ib6d0b7d0d43b8c501346fac77c5908ef4d23691b
diff --git a/Android.bp b/Android.bp
index ae3ba16..135442f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --device --dependencies --tests --patch=patches/Android.bp.patch.
+// This file is generated by cargo2android.py --config cargo2android.json.
+// Do not modify this file as changes will be overridden on upgrade.
package {
default_applicable_licenses: ["external_rust_crates_unicode-bidi_license"],
@@ -73,6 +74,9 @@
rust_test_host {
name: "unicode-bidi_host_test_src_lib",
defaults: ["unicode-bidi_defaults"],
+ test_options: {
+ unit_test: true,
+ },
}
rust_test {
@@ -82,5 +86,5 @@
// dependent_library ["feature_list"]
// matches-0.1.8
-// serde-1.0.118 "default,std"
-// serde_test-1.0.118
+// serde-1.0.125 "default,std"
+// serde_test-1.0.125
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..911c36f
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,11 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.resolv"
+ ],
+ "dependencies": true,
+ "device": true,
+ "min-sdk-version": "29",
+ "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 c5ab732..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 83d60c0..66ceebd 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -11,6 +11,11 @@ rust_library {
- rustlibs: [
- "libmatches",
- ],
-+ apex_available: [
-+ "//apex_available:platform",
-+ "com.android.resolv",
-+ ],
-+ min_sdk_version: "29",
- }
-
- rust_defaults {
