diff --git a/CMakeLists.txt b/CMakeLists.txt
index 57ec38a75f..c8c1fd03ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -238,7 +238,9 @@ if(ANDROID)
         ${EXPAT_LIBRARY}
     )
     # A bug in Android NDK r22: https://github.com/android/ndk/issues/1418
-    set_source_files_properties(${CMAKE_SOURCE_DIR}/src/settings.cpp PROPERTIES COMPILE_FLAGS "-O1")
+    if(ANDROID_ABI EQUAL "armeabi-v7a" OR ANDROID_ABI EQUAL "x86")
+        set_source_files_properties(${CMAKE_SOURCE_DIR}/src/settings.cpp PROPERTIES COMPILE_FLAGS "-O0")
+    endif(ANDROID_ABI)
 endif(ANDROID)
 
 if(APPLE)