Snap for 7809064 from 0fb80841978ca3f15ace57d950200f99512255a0 to tm-release
Change-Id: I4e90e3d04f03038893b89b5a4c8472cf2aebaa1f
diff --git a/Android.bp b/Android.bp
index af8bfb3..103e9b4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --device --run --dependencies --tests.
+// 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_fnv_license"],
@@ -37,9 +38,11 @@
}
rust_defaults {
- name: "fnv_defaults",
+ name: "fnv_test_defaults",
crate_name: "fnv",
srcs: ["lib.rs"],
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.0.7",
test_suites: ["general-tests"],
auto_gen_config: true,
edition: "2015",
@@ -51,22 +54,31 @@
rust_test_host {
name: "fnv_host_test_lib",
- defaults: ["fnv_defaults"],
+ defaults: ["fnv_test_defaults"],
+ test_options: {
+ unit_test: true,
+ },
}
rust_test {
name: "fnv_device_test_lib",
- defaults: ["fnv_defaults"],
+ defaults: ["fnv_test_defaults"],
}
rust_library {
name: "libfnv",
host_supported: true,
crate_name: "fnv",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.0.7",
srcs: ["lib.rs"],
edition: "2015",
features: [
"default",
"std",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..86c645c
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,9 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "device": true,
+ "run": true,
+ "tests": true
+ }
\ No newline at end of file