diff --git a/cppSettings.gradle b/cppSettings.gradle
index 91ccca00d2..3e2514cc8e 100644
--- a/cppSettings.gradle
+++ b/cppSettings.gradle
@@ -93,7 +93,7 @@ subprojects {
                         // arm, and doesn't understand this flag, so it is removed from both
                         cppCompiler.withArguments { args ->
                             args << '-std=c++1y' << '-Wformat=2' << '-Wall' << '-Wextra' << '-Werror' << '-pedantic'
-                            args << '-Wno-psabi' << '-Wno-unused-parameter' << '-fPIC' << '-O0' << '-g3' << '-rdynamic'
+                            args << '-Wno-psabi' << '-Wno-unused-parameter' << '-fPIC' << '-Og' << '-g3' << '-rdynamic'
                             //TODO: When the compiler allows us to actually call deprecated functions from within
                             // deprecated function, remove this line (this will cause calling deprecated functions
                             // to be treated as a warning rather than an error).
@@ -122,7 +122,7 @@ subprojects {
                         // arm, and doesn't understand this flag, so it is removed from both
                         cppCompiler.withArguments { args ->
                             args << '-std=c++1y' << '-Wformat=2' << '-Wall' << '-Wextra' << '-Werror' << '-pedantic'
-                            args << '-Wno-psabi' << '-Wno-unused-parameter' << '-fPIC' << '-O0' << '-g3' << '-rdynamic'
+                            args << '-Wno-psabi' << '-Wno-unused-parameter' << '-fPIC' << '-Og' << '-g3' << '-rdynamic'
                             //TODO: When the compiler allows us to actually call deprecated functions from within
                             // deprecated function, remove this line (this will cause calling deprecated functions
                             // to be treated as a warning rather than an error).