1diff --git a/Cargo.toml b/Cargo.toml 2index 77fe68f..bc62b4a 100644 3--- a/Cargo.toml 4+++ b/Cargo.toml 5@@ -10,4 +10,5 @@ 6 # See Cargo.toml.orig for the original contents. 7 8 [package] 9+edition = "2018" # ANDROID: Required to build dylib in no_std. 10 name = "memoffset" 11diff --git a/src/lib.rs b/src/lib.rs 12index c85fb01..25b0444 100644 13--- a/src/lib.rs 14+++ b/src/lib.rs 15@@ -55,5 +55,5 @@ 16 //! let checksum = crc16(checksum_range); 17 //! ``` 18 19-#![no_std] 20+#![cfg_attr(not(aosp_force_use_std), no_std)] 21 #![cfg_attr( 22