android/ndk-samples
1
0
Fork 0
mirror of https://github.com/android/ndk-samples synced 2025-11-04 22:53:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Stop downgrading C++ std.

Browse Source 
C17 and C++17 are clang's default.
This commit is contained in:
Dan Albert
2024-05-14 14:02:41 -07:00
committed by Dan Albert
parent d304b6e60d
commit 14641435ae
14 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
camera/basic/src/main/cpp/CMakeLists.txt
View File

@@ -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

2
camera/texture-view/src/main/cpp/CMakeLists.txt
View File

@@ -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.

2
endless-tunnel/app/src/main/cpp/CMakeLists.txt
View File

@@ -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

2
gles3jni/app/src/main/cpp/CMakeLists.txt
View File

@@ -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}).")

2
hello-gl2/app/src/main/cpp/CMakeLists.txt
View File

@@ -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)

2
hello-libs/app/src/main/cpp/CMakeLists.txt
View File

@@ -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)

2
hello-vulkan/app/src/main/cpp/CMakeLists.txt
View File

@@ -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)

2
native-activity/app/src/main/cpp/CMakeLists.txt
View File

@@ -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.

2
native-audio/app/src/main/cpp/CMakeLists.txt
View File

@@ -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)

2
native-codec/app/src/main/cpp/CMakeLists.txt
View File

@@ -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

2
native-midi/app/src/main/cpp/CMakeLists.txt
View File

@@ -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

1
prefab/curl-ssl/app/src/main/cpp/Application.mk
View File

@@ -1,3 +1,2 @@
APP_STL := c++_shared
APP_CPPFLAGS := -std=c++17
APP_CFLAGS := -Wall -Werror

1
prefab/prefab-dependency/app/src/main/cpp/Application.mk
View File

@@ -1,3 +1,2 @@
APP_STL := c++_shared
APP_CPPFLAGS := -std=c++17
APP_CFLAGS := -Wall -Werror

2
sensor-graph/accelerometer/src/main/cpp/CMakeLists.txt
View File

@@ -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)