Generate apex_available from c2a instead of a patch am: 9d0e2785f6 am: a2a05c87b5
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/1689358
Change-Id: I1d86fefa03970b4b1e0ec9bcea6d09e200f7f8ad
diff --git a/Android.bp b/Android.bp
index 69b9661..7b4b69d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --dependencies --device --tests --copy-out --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: [
@@ -75,6 +76,9 @@
rust_test_host {
name: "proc-macro-nested_host_test_src_lib",
defaults: ["proc-macro-nested_defaults"],
+ test_options: {
+ unit_test: true,
+ },
}
rust_test {
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..61885d6
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,11 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "copy-out": true,
+ "dependencies": true,
+ "device": 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 c80e275..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index b9fd260..103ae9b 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -16,6 +16,10 @@ rust_library {
- ":copy_proc-macro-nested_build_out",
- ],
- edition: "2015",
-+ apex_available: [
-+ "//apex_available:platform",
-+ "com.android.virt",
-+ ],
- }
-
- rust_defaults {
