Generate apex_available from c2a instead of a patch am: af4c965f0b am: ff06a80033 am: cc060ad2f5
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/android_logger/+/1687127
Change-Id: I121345b4c09b19069407aa932295e2500abe7784
diff --git a/Android.bp b/Android.bp
index 1e4ec18..c6dc26c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --dependencies --device --no-host --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 {
@@ -124,5 +124,5 @@
// lazy_static-1.4.0
// log-0.4.14 "std"
// memchr-2.3.4 "default,std,use_std"
-// regex-1.4.5 "aho-corasick,memchr,perf,perf-cache,perf-dfa,perf-inline,perf-literal,std"
+// regex-1.4.6 "aho-corasick,memchr,perf,perf-cache,perf-dfa,perf-inline,perf-literal,std"
// regex-syntax-0.6.23
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..ffae194
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,11 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "dependencies": true,
+ "device": true,
+ "no-host": 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 17eea13..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index a7d9bc2..5bba4d9 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -35,6 +35,10 @@ rust_library {
- "liblazy_static",
- "liblog_rust",
- ],
-+ apex_available: [
-+ "//apex_available:platform",
-+ "com.android.virt",
-+ ],
- }
-
- // dependent_library ["feature_list"]
