From cbb0627cf7a3a015eea4f784ac5e1a4b642e75ea Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Mon, 14 Jun 2021 15:36:42 +0000
Subject: Allow use in virt APEX.

Bug: 190503456
Test: mm
Merged-In: I55889f75be923bd638eb732785dbef96cf597c10
Change-Id: I55889f75be923bd638eb732785dbef96cf597c10
---
 Android.bp         | 11 +++++++----
 cargo2android.json |  9 +++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 cargo2android.json

diff --git a/Android.bp b/Android.bp
index aea33a1..678f976 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --device --dependencies.
+// 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: ["external_rust_crates_crc32fast_license"],
@@ -46,12 +47,14 @@ rust_library {
         "default",
         "std",
     ],
-    flags: [
-        "--cfg crc32fast_stdarchx86",
-    ],
+    cfgs: ["crc32fast_stdarchx86"],
     rustlibs: [
         "libcfg_if",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }
 
 // dependent_library ["feature_list"]
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..42b7833
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,9 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "dependencies": true,
+  "device": true,
+  "run": true
+}
\ No newline at end of file
-- 
cgit v1.2.3