Snap for 7325276 from 7a1e406b1ff28f875e3c938871a0454c26002a90 to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-security-11.0.0_r71android-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-release

Change-Id: Iedb560e4613413b9b8543f9928f6554a92ce94f8

3 files changed, 16 insertions, 18 deletions

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 @@ license {
 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"]