1 files changed, 4 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index c2f83d7..b617d11 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,7 +25,7 @@ rust_library {
     cargo_env_compat: true,
     cargo_pkg_version: "0.9.0",
     srcs: ["src/lib.rs"],
-    edition: "2015",
+    edition: "2018",
     features: ["default"],
     cfgs: [
         "allow_clippy",
@@ -34,6 +34,7 @@ rust_library {
         "raw_ref_macros",
         "stable_const",
         "tuple_ty",
+        "aosp_force_use_std",
     ],
     apex_available: [
         "//apex_available:platform",
@@ -56,7 +57,7 @@ rust_test {
     test_options: {
         unit_test: true,
     },
-    edition: "2015",
+    edition: "2018",
     features: ["default"],
     cfgs: [
         "allow_clippy",
@@ -65,5 +66,6 @@ rust_test {
         "raw_ref_macros",
         "stable_const",
         "tuple_ty",
+        "aosp_force_use_std",
     ],
 }