Generate apex_available from c2a instead of a patch am: 3f92d191de am: fc011c2e3d am: 16fc4abb85
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/android_log-sys/+/1687129
Change-Id: Icc5cad005d00d91e5145fa2d92fe32754b8cb94b
diff --git a/Android.bp b/Android.bp
index 151b917..37e3a31 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --dependencies --device --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: [
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..623aa56
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,10 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "dependencies": true,
+ "device": true,
+ "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
index 207e6be..b458dd2 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -1,6 +1,6 @@
---- Android.bp.orig 2020-10-30 16:31:00.469140136 -0700
-+++ Android.bp 2020-10-30 16:31:43.436969421 -0700
-@@ -6,4 +6,14 @@
+--- a/Android.bp
++++ b/Android.bp
+@@ -45,6 +45,12 @@ rust_library {
crate_name: "android_log_sys",
srcs: ["src/lib.rs"],
edition: "2015",
@@ -10,8 +10,6 @@
+ enabled: false,
+ },
+ },
-+ apex_available: [
-+ "//apex_available:platform",
-+ "com.android.virt",
-+ ],
- }
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
