Cleanup native-activity CMakeLists.txt.

Author: Dan Albert

native-activity/app/src/main/cpp/CMakeLists.txt

@@ -14,34 +14,28 @@
 # limitations under the License.
 #
 
-cmake_minimum_required(VERSION 3.22.1)
+cmake_minimum_required(VERSION 4.1.0)
 project(NativeActivity LANGUAGES C CXX)
 
-# build native_app_glue as a static lib
-set(${CMAKE_C_FLAGS}, "${CMAKE_C_FLAGS}")
-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} -Wall -Werror")
+include(AppLibrary)
 
-# Export ANativeActivity_onCreate(),
-# Refer to: https://github.com/android-ndk/ndk/issues/381.
-set(CMAKE_SHARED_LINKER_FLAGS
-    "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_onCreate")
+add_library(native_app_glue STATIC
+    ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c
+)
 
-add_library(native-activity SHARED main.cpp)
+add_app_library(native-activity SHARED main.cpp)
 
 target_include_directories(native-activity PRIVATE
-    ${ANDROID_NDK}/sources/android/native_app_glue)
+    ${ANDROID_NDK}/sources/android/native_app_glue
+)
 
-# add lib dependencies
 target_link_libraries(native-activity
     android
-    native_app_glue
+    $<LINK_LIBRARY:WHOLE_ARCHIVE,native_app_glue>
     EGL
     GLESv1_CM
-    log)
+    log
+)
 
 if (ANDROID_ABI STREQUAL riscv64)
     # This sample uses Sensor Manager and Choreographer APIs which are