Stop downgrading C++ std.

C17 and C++17 are clang's default.
android · May 14, 2024 · 1464143 · 1464143
1 parent d304b6e
commit 1464143
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 14 deletions.
diff --git a/camera/basic/src/main/cpp/CMakeLists.txt b/camera/basic/src/main/cpp/CMakeLists.txt
@@ -27,7 +27,7 @@ add_library(app_glue STATIC
     ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c)
 
 # now build app's shared lib
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
 # Export ANativeActivity_onCreate(),
 # Refer to: https://github.com/android-ndk/ndk/issues/381.
 set(CMAKE_SHARED_LINKER_FLAGS

diff --git a/camera/texture-view/src/main/cpp/CMakeLists.txt b/camera/texture-view/src/main/cpp/CMakeLists.txt
@@ -20,7 +20,7 @@ set(CMAKE_VERBOSE_MAKEFILE on)
 set(COMMON_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../common)
 
 # now build app's shared lib
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
 
 # Export ANativeActivity_onCreate(),
 # Refer to: https://github.com/android-ndk/ndk/issues/381.

diff --git a/endless-tunnel/app/src/main/cpp/CMakeLists.txt b/endless-tunnel/app/src/main/cpp/CMakeLists.txt
@@ -26,7 +26,7 @@ set(CMAKE_SHARED_LINKER_FLAGS
     "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_onCreate")
 
 # Set common compiler options
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -Wall")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 add_definitions("-DGLM_FORCE_SIZE_T_LENGTH -DGLM_FORCE_RADIANS")
 
 # Import the CMakeLists.txt for the glm library

diff --git a/gles3jni/app/src/main/cpp/CMakeLists.txt b/gles3jni/app/src/main/cpp/CMakeLists.txt
@@ -20,7 +20,7 @@ cmake_minimum_required(VERSION 3.22.1)
 #   [24, infinite)   ES2 & ES3 & Vulkan
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions -Wall")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti -fno-exceptions -Wall")
 if (${ANDROID_PLATFORM_LEVEL} LESS 12)
   message(FATAL_ERROR "OpenGL 2 is not supported before API level 11 \
                       (currently using ${ANDROID_PLATFORM_LEVEL}).")

diff --git a/hello-gl2/app/src/main/cpp/CMakeLists.txt b/hello-gl2/app/src/main/cpp/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.22.1)
 
 # now build app's shared lib
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 
 add_library(gl2jni SHARED
             gl_code.cpp)

diff --git a/hello-libs/app/src/main/cpp/CMakeLists.txt b/hello-libs/app/src/main/cpp/CMakeLists.txt
@@ -31,7 +31,7 @@ set_target_properties(lib_gperf PROPERTIES IMPORTED_LOCATION
     ${distribution_DIR}/gperf/lib/${ANDROID_ABI}/libgperf.so)
 
 # build application's shared lib
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 
 add_library(hello-libs SHARED
             hello-libs.cpp)

diff --git a/hello-vulkan/app/src/main/cpp/CMakeLists.txt b/hello-vulkan/app/src/main/cpp/CMakeLists.txt
@@ -26,7 +26,7 @@ set(CMAKE_SHARED_LINKER_FLAGS
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # Now build app's shared lib
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Wall")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 
 add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR=1)
 

diff --git a/native-activity/app/src/main/cpp/CMakeLists.txt b/native-activity/app/src/main/cpp/CMakeLists.txt
@@ -22,7 +22,7 @@ add_library(native_app_glue STATIC
     ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c)
 
 # now build app's shared lib
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -Wall -Werror")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror")
 
 # Export ANativeActivity_onCreate(),
 # Refer to: https://github.com/android-ndk/ndk/issues/381.

diff --git a/native-audio/app/src/main/cpp/CMakeLists.txt b/native-audio/app/src/main/cpp/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 
 add_library(native-audio-jni SHARED
             native-audio-jni.c)

diff --git a/native-codec/app/src/main/cpp/CMakeLists.txt b/native-codec/app/src/main/cpp/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -UNDEBUG")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -UNDEBUG")
 
 add_library(native-codec-jni SHARED
             looper.cpp

diff --git a/native-midi/app/src/main/cpp/CMakeLists.txt b/native-midi/app/src/main/cpp/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.22.1)
 project(native_midi LANGUAGES C CXX)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Werror -O0")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -O0")
 
 add_library(${PROJECT_NAME}
   SHARED

diff --git a/prefab/curl-ssl/app/src/main/cpp/Application.mk b/prefab/curl-ssl/app/src/main/cpp/Application.mk
@@ -1,3 +1,2 @@
 APP_STL := c++_shared
-APP_CPPFLAGS := -std=c++17
 APP_CFLAGS := -Wall -Werror
diff --git a/prefab/prefab-dependency/app/src/main/cpp/Application.mk b/prefab/prefab-dependency/app/src/main/cpp/Application.mk
@@ -1,3 +1,2 @@
 APP_STL := c++_shared
-APP_CPPFLAGS := -std=c++17
 APP_CFLAGS := -Wall -Werror
diff --git a/sensor-graph/accelerometer/src/main/cpp/CMakeLists.txt b/sensor-graph/accelerometer/src/main/cpp/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.22.1)
 # That warning is ignore for now because those are release config only issues
 # caused by assert(). The fix is to migrate to CHECK/DCHECK, but that requires
 # importing absl or libbase first.
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror -Wno-unused-variable")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wno-unused-variable")
 
 add_library(accelerometergraph SHARED
             sensorgraph.cpp)