Generate apex_available from c2a instead of a patch am: 32f926acec am: 01c6827421 am: fd5d2d7cc5 am: 7a1e406b1f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/log/+/1688982
Change-Id: I8f1028db0de95738f7798261095adbefcc4e8741
diff --git a/Android.bp b/Android.bp
index 0b57b3c..6b91766 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies --features=std --patch=patches/Android.bp.diff.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -40,14 +40,15 @@
rust_library {
name: "liblog_rust",
stem: "liblog",
+ // has rustc warnings
host_supported: true,
crate_name: "log",
srcs: ["src/lib.rs"],
edition: "2015",
features: ["std"],
- flags: [
- "--cfg atomic_cas",
- "--cfg has_atomics",
+ cfgs: [
+ "atomic_cas",
+ "has_atomics",
],
rustlibs: [
"libcfg_if",
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..723587f
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,11 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "//apex_available:anyapex"
+ ],
+ "dependencies": true,
+ "device": true,
+ "features": "std",
+ "min-sdk-version": "29",
+ "run": true
+}
\ No newline at end of file
diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
deleted file mode 100644
index f0de6f5..0000000
--- a/patches/Android.bp.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- Android.bp 2020-12-14 20:08:02.451621093 +0900
-+++ Android.bp.new 2020-12-14 20:05:44.460062409 +0900
-@@ -50,6 +50,11 @@ rust_library {
- rustlibs: [
- "libcfg_if",
- ],
-+ apex_available: [
-+ "//apex_available:platform",
-+ "//apex_available:anyapex",
-+ ],
-+ min_sdk_version: "29",
- }
-
- // dependent_library ["feature_list"]
