aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2021-06-18 15:00:07 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-18 15:00:07 +0000
commitb2bb63721d2bfa4539c31f05188f4a69225781a4 (patch)
treeda16ac59249dd960ee43cffa151beff486bd4e7e
parente3f36251e60360df9f832fca45ab0f29d16984ad (diff)
parentea7647807a2457b1c28ae7f0b42657562a99c7e0 (diff)
downloadcrc32fast-b2bb63721d2bfa4539c31f05188f4a69225781a4.tar.gz
Allow use in virt APEX. am: ea7647807aandroid-s-beta-4android-s-beta-3android-s-beta-4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/crc32fast/+/1737098 Change-Id: Ia9022b51ae7349feda6f5a07d81b987dfe844e5c
-rw-r--r--Android.bp11
-rw-r--r--cargo2android.json9
2 files changed, 16 insertions, 4 deletions
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