diff --git a/Android.bp b/Android.bp
index 56e7903..744c7c6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,6 +37,7 @@
 
 cc_defaults {
     name: "neuralnetworks_defaults",
+    cpp_std: "gnu++17",
     cflags: [
         "-O3",
         "-Wall",
diff --git a/common/Android.bp b/common/Android.bp
index 108cbe1..8f3e118 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -251,6 +251,7 @@
     name: "neuralnetworks_cl_defaults",
     host_supported: false,
     vendor_available: false,
+    cpp_std: "gnu++17",
     stl: "libc++_static",
     sdk_version: "current",
     min_sdk_version: "29",