Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."
diff --git a/Android.bp b/Android.bp
index fbdb4e6..554acac 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,7 +40,6 @@
rust_library {
name: "libserde_cbor",
host_supported: true,
- vendor_available: true,
crate_name: "serde_cbor",
cargo_env_compat: true,
cargo_pkg_version: "0.11.2",
@@ -55,45 +54,12 @@
"libhalf",
"libserde",
],
+ vendor_available: true,
}
rust_defaults {
name: "serde_cbor_test_defaults",
crate_name: "serde_cbor",
- srcs: ["src/lib.rs"],
- cargo_env_compat: true,
- cargo_pkg_version: "0.11.2",
- test_suites: ["general-tests"],
- auto_gen_config: true,
- edition: "2018",
- features: [
- "default",
- "std",
- "tags",
- ],
- rustlibs: [
- "libhalf",
- "libserde",
- ],
- proc_macros: ["libserde_derive"],
-}
-
-rust_test_host {
- name: "serde_cbor_host_test_src_lib",
- defaults: ["serde_cbor_test_defaults"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "serde_cbor_device_test_src_lib",
- defaults: ["serde_cbor_test_defaults"],
-}
-
-rust_defaults {
- name: "serde_cbor_test_defaults_serde_cbor",
- crate_name: "serde_cbor",
cargo_env_compat: true,
cargo_pkg_version: "0.11.2",
test_suites: ["general-tests"],
@@ -112,9 +78,10 @@
proc_macros: ["libserde_derive"],
}
-rust_test_host {
- name: "serde_cbor_host_test_tests_bennofs",
- defaults: ["serde_cbor_test_defaults_serde_cbor"],
+rust_test {
+ name: "serde_cbor_test_tests_bennofs",
+ defaults: ["serde_cbor_test_defaults"],
+ host_supported: true,
srcs: ["tests/bennofs.rs"],
test_options: {
unit_test: true,
@@ -122,14 +89,9 @@
}
rust_test {
- name: "serde_cbor_device_test_tests_bennofs",
- defaults: ["serde_cbor_test_defaults_serde_cbor"],
- srcs: ["tests/bennofs.rs"],
-}
-
-rust_test_host {
- name: "serde_cbor_host_test_tests_canonical",
- defaults: ["serde_cbor_test_defaults_serde_cbor"],
+ name: "serde_cbor_test_tests_canonical",
+ defaults: ["serde_cbor_test_defaults"],
+ host_supported: true,
srcs: ["tests/canonical.rs"],
test_options: {
unit_test: true,
@@ -137,14 +99,9 @@
}
rust_test {
- name: "serde_cbor_device_test_tests_canonical",
- defaults: ["serde_cbor_test_defaults_serde_cbor"],
- srcs: ["tests/canonical.rs"],
-}
-
-rust_test_host {
- name: "serde_cbor_host_test_tests_de",
- defaults: ["serde_cbor_test_defaults_serde_cbor"],
+ name: "serde_cbor_test_tests_de",
+ defaults: ["serde_cbor_test_defaults"],
+ host_supported: true,
srcs: ["tests/de.rs"],
test_options: {
unit_test: true,
@@ -152,14 +109,9 @@
}
rust_test {
- name: "serde_cbor_device_test_tests_de",
- defaults: ["serde_cbor_test_defaults_serde_cbor"],
- srcs: ["tests/de.rs"],
-}
-
-rust_test_host {
- name: "serde_cbor_host_test_tests_enum",
- defaults: ["serde_cbor_test_defaults_serde_cbor"],
+ name: "serde_cbor_test_tests_enum",
+ defaults: ["serde_cbor_test_defaults"],
+ host_supported: true,
srcs: ["tests/enum.rs"],
test_options: {
unit_test: true,
@@ -167,14 +119,9 @@
}
rust_test {
- name: "serde_cbor_device_test_tests_enum",
- defaults: ["serde_cbor_test_defaults_serde_cbor"],
- srcs: ["tests/enum.rs"],
-}
-
-rust_test_host {
- name: "serde_cbor_host_test_tests_ser",
- defaults: ["serde_cbor_test_defaults_serde_cbor"],
+ name: "serde_cbor_test_tests_ser",
+ defaults: ["serde_cbor_test_defaults"],
+ host_supported: true,
srcs: ["tests/ser.rs"],
test_options: {
unit_test: true,
@@ -182,14 +129,9 @@
}
rust_test {
- name: "serde_cbor_device_test_tests_ser",
- defaults: ["serde_cbor_test_defaults_serde_cbor"],
- srcs: ["tests/ser.rs"],
-}
-
-rust_test_host {
- name: "serde_cbor_host_test_tests_std_types",
- defaults: ["serde_cbor_test_defaults_serde_cbor"],
+ name: "serde_cbor_test_tests_std_types",
+ defaults: ["serde_cbor_test_defaults"],
+ host_supported: true,
srcs: ["tests/std_types.rs"],
test_options: {
unit_test: true,
@@ -197,14 +139,9 @@
}
rust_test {
- name: "serde_cbor_device_test_tests_std_types",
- defaults: ["serde_cbor_test_defaults_serde_cbor"],
- srcs: ["tests/std_types.rs"],
-}
-
-rust_test_host {
- name: "serde_cbor_host_test_tests_tags",
- defaults: ["serde_cbor_test_defaults_serde_cbor"],
+ name: "serde_cbor_test_tests_tags",
+ defaults: ["serde_cbor_test_defaults"],
+ host_supported: true,
srcs: ["tests/tags.rs"],
test_options: {
unit_test: true,
@@ -212,22 +149,11 @@
}
rust_test {
- name: "serde_cbor_device_test_tests_tags",
- defaults: ["serde_cbor_test_defaults_serde_cbor"],
- srcs: ["tests/tags.rs"],
-}
-
-rust_test_host {
- name: "serde_cbor_host_test_tests_value",
- defaults: ["serde_cbor_test_defaults_serde_cbor"],
+ name: "serde_cbor_test_tests_value",
+ defaults: ["serde_cbor_test_defaults"],
+ host_supported: true,
srcs: ["tests/value.rs"],
test_options: {
unit_test: true,
},
}
-
-rust_test {
- name: "serde_cbor_device_test_tests_value",
- defaults: ["serde_cbor_test_defaults_serde_cbor"],
- srcs: ["tests/value.rs"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index e9029cf..b9516e7 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,47 +1,93 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/base64"
+ },
+ {
+ "path": "external/rust/crates/tinytemplate"
+ },
+ {
+ "path": "external/rust/crates/tinyvec"
+ },
+ {
+ "path": "external/rust/crates/unicode-xid"
+ }
+ ],
"presubmit": [
{
- "name": "base64_device_test_tests_decode"
+ "name": "keystore2_test"
},
{
- "name": "base64_device_test_tests_encode"
+ "name": "keystore2_test_utils_test"
},
{
- "name": "base64_device_test_tests_helpers"
+ "name": "legacykeystore_test"
},
{
- "name": "serde_cbor_device_test_src_lib"
+ "name": "microdroid_manager_test"
},
{
- "name": "serde_cbor_device_test_tests_bennofs"
+ "name": "serde_cbor_test_tests_bennofs"
},
{
- "name": "serde_cbor_device_test_tests_canonical"
+ "name": "serde_cbor_test_tests_canonical"
},
{
- "name": "serde_cbor_device_test_tests_de"
+ "name": "serde_cbor_test_tests_de"
},
{
- "name": "serde_cbor_device_test_tests_enum"
+ "name": "serde_cbor_test_tests_enum"
},
{
- "name": "serde_cbor_device_test_tests_ser"
+ "name": "serde_cbor_test_tests_ser"
},
{
- "name": "serde_cbor_device_test_tests_std_types"
+ "name": "serde_cbor_test_tests_std_types"
},
{
- "name": "serde_cbor_device_test_tests_tags"
+ "name": "serde_cbor_test_tests_tags"
},
{
- "name": "serde_cbor_device_test_tests_value"
+ "name": "serde_cbor_test_tests_value"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "keystore2_test"
},
{
- "name": "unicode-xid_device_test_src_lib"
+ "name": "keystore2_test_utils_test"
},
{
- "name": "unicode-xid_device_test_tests_exhaustive_tests"
+ "name": "legacykeystore_test"
+ },
+ {
+ "name": "microdroid_manager_test"
+ },
+ {
+ "name": "serde_cbor_test_tests_bennofs"
+ },
+ {
+ "name": "serde_cbor_test_tests_canonical"
+ },
+ {
+ "name": "serde_cbor_test_tests_de"
+ },
+ {
+ "name": "serde_cbor_test_tests_enum"
+ },
+ {
+ "name": "serde_cbor_test_tests_ser"
+ },
+ {
+ "name": "serde_cbor_test_tests_std_types"
+ },
+ {
+ "name": "serde_cbor_test_tests_tags"
+ },
+ {
+ "name": "serde_cbor_test_tests_value"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
index 12be884..604d595 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,7 +1,7 @@
{
- "device": true,
- "features": "default,tags",
- "run": true,
- "tests": true,
- "vendor_available": true
-}
+ "device": true,
+ "features": "default,tags",
+ "run": true,
+ "tests": true,
+ "vendor-available": true
+}
\ No newline at end of file
