Snap for 8564071 from 18be09d71f024004fca137ce4246bdf5324c93ce to mainline-sdkext-release
Change-Id: I6f92a05585b7730d30f00f5ab6c1c6d4349546e7
diff --git a/Android.bp b/Android.bp
index efec440..e87a1af 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// 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 {
@@ -41,6 +41,13 @@
name: "libhalf",
host_supported: true,
crate_name: "half",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.7.1",
srcs: ["src/lib.rs"],
edition: "2018",
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
+ vendor_available: true,
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 7f5d34a..ea1a318 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,32 +1,69 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/base64"
+ },
+ {
+ "path": "external/rust/crates/serde_cbor"
+ },
+ {
+ "path": "external/rust/crates/tinytemplate"
+ },
+ {
+ "path": "external/rust/crates/tinyvec"
+ },
+ {
+ "path": "external/rust/crates/unicode-xid"
+ },
+ {
+ "path": "external/rust/crates/vulkano"
+ }
+ ],
"presubmit": [
{
- "name": "serde_cbor_device_test_tests_std_types"
+ "name": "diced_test"
},
{
- "name": "serde_cbor_device_test_tests_enum"
+ "name": "diced_vendor_test"
},
{
- "name": "serde_cbor_device_test_tests_value"
+ "name": "keystore2_test"
},
{
- "name": "serde_cbor_device_test_tests_canonical"
+ "name": "keystore2_test_utils_test"
},
{
- "name": "serde_cbor_device_test_tests_ser"
+ "name": "legacykeystore_test"
},
{
- "name": "serde_cbor_device_test_tests_bennofs"
+ "name": "libcert_request_validator_tests"
},
{
- "name": "serde_cbor_device_test_tests_tags"
+ "name": "microdroid_manager_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "diced_test"
},
{
- "name": "serde_cbor_device_test_tests_de"
+ "name": "diced_vendor_test"
},
{
- "name": "serde_cbor_device_test_src_lib"
+ "name": "keystore2_test"
+ },
+ {
+ "name": "keystore2_test_utils_test"
+ },
+ {
+ "name": "legacykeystore_test"
+ },
+ {
+ "name": "libcert_request_validator_tests"
+ },
+ {
+ "name": "microdroid_manager_test"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..84618e2
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,9 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "device": true,
+ "run": true,
+ "vendor-available": true
+}
\ No newline at end of file
