Snap for 8626064 from 2b803731c01caa4523f7644fd106730556fd97db to mainline-go-odp-release
Change-Id: I3bb510910fda3726cc1625f0f5307c0467745759
diff --git a/TEST_MAPPING b/TEST_MAPPING
index bb5b919..5370f49 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -37,6 +37,21 @@
"name": "bitflags_test_tests_basic"
},
{
+ "name": "diced_open_dice_cbor_test"
+ },
+ {
+ "name": "diced_sample_inputs_test"
+ },
+ {
+ "name": "diced_test"
+ },
+ {
+ "name": "diced_utils_test"
+ },
+ {
+ "name": "diced_vendor_test"
+ },
+ {
"name": "keystore2_crypto_test_rust"
},
{
@@ -58,9 +73,6 @@
"name": "microdroid_manager_test"
},
{
- "name": "open_then_run_module"
- },
- {
"name": "virtualizationservice_device_test"
}
],
@@ -81,6 +93,21 @@
"name": "bitflags_test_tests_basic"
},
{
+ "name": "diced_open_dice_cbor_test"
+ },
+ {
+ "name": "diced_sample_inputs_test"
+ },
+ {
+ "name": "diced_test"
+ },
+ {
+ "name": "diced_utils_test"
+ },
+ {
+ "name": "diced_vendor_test"
+ },
+ {
"name": "keystore2_crypto_test_rust"
},
{
@@ -102,9 +129,6 @@
"name": "microdroid_manager_test"
},
{
- "name": "open_then_run_module"
- },
- {
"name": "virtualizationservice_device_test"
}
]
diff --git a/patches/std.diff b/patches/std.diff
index c2ccaee..a34fe97 100644
--- a/patches/std.diff
+++ b/patches/std.diff
@@ -1,15 +1,14 @@
diff --git a/src/lib.rs b/src/lib.rs
-index 935e432..36c0699 100644
+index 935e432..7e87795 100644
--- a/src/lib.rs
+++ b/src/lib.rs
-@@ -278,6 +278,10 @@
- #![cfg_attr(not(test), no_std)]
+@@ -275,7 +275,8 @@
+ //!
+ //! Users should generally avoid defining a flag with a value of zero.
+
+-#![cfg_attr(not(test), no_std)]
++// ANDROID: Use std to allow building as a dylib.
++#![cfg_attr(not(any(test, android_dylib)), no_std)]
#![doc(html_root_url = "https://docs.rs/bitflags/1.3.2")]
-+// ANDROID: Unconditionally use std to allow building as a dylib
-+#[macro_use]
-+extern crate std;
-+
#[doc(hidden)]
- pub extern crate core as _core;
-
diff --git a/src/lib.rs b/src/lib.rs
index 36c0699..7e87795 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -275,13 +275,10 @@
//!
//! Users should generally avoid defining a flag with a value of zero.
-#![cfg_attr(not(test), no_std)]
+// ANDROID: Use std to allow building as a dylib.
+#![cfg_attr(not(any(test, android_dylib)), no_std)]
#![doc(html_root_url = "https://docs.rs/bitflags/1.3.2")]
-// ANDROID: Unconditionally use std to allow building as a dylib
-#[macro_use]
-extern crate std;
-
#[doc(hidden)]
pub extern crate core as _core;
