CMakeLists cleanup

Author: iscle

CMakeLists.txt

@@ -1,17 +1,9 @@
 cmake_minimum_required(VERSION 3.16.3)
 
-set(CMAKE_CXX_COMPILER_VERSION 20)
 set(CMAKE_CXX_STANDARD 20)
 
-# NDK Settings
-#add_compile_definitions(ANDROID_ABI=arm64-v8a)
-#add_compile_definitions(ANDROID_ABI=armeabi-v7a)
-#add_compile_definitions(ANDROID_ARM_NEON=true)
-#add_compile_definitions(ANDROID_PLATFORM=android-24)
-
 project("ViPER4Android")
 add_compile_definitions(VIPER_VERSION=20240314)
-add_compile_definitions(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__)
 
 # AIDL
 set(AIDL_SRC
@@ -141,21 +133,16 @@ set(AIDL_SRC
         generated/android/hardware/common/fmq/MQDescriptor.cpp
         generated/android/hardware/common/fmq/SynchronizedReadWrite.cpp
         generated/android/hardware/common/fmq/GrantorDescriptor.cpp
-        generated/android/hardware/common/fmq/UnsynchronizedWrite.cpp
-)
+        generated/android/hardware/common/fmq/UnsynchronizedWrite.cpp)
 
 set(AIDL_INCLUDE_DIRS
-        generated/include
-)
+        generated/include)
 
 # ViPERFX
 include_directories(src/include)
 include_directories(${AIDL_INCLUDE_DIRS})
 
 set(FILES
-        # AIDL
-        ${AIDL_SRC}
-
         # Main
         src/viper/ViPER.cpp
         src/ViPER4Android.cpp
@@ -210,21 +197,10 @@ set(FILES
         src/viper/utils/TimeConstDelay.cpp
         src/viper/utils/WaveBuffer.cpp)
 
-add_library(
-        # Sets the name of the library.
-        v4a_re
-
-        # Sets the library as a shared library.
-        SHARED
-
-        # Provides a relative path to your source file(s).
+add_library(v4a_re SHARED
+        ${AIDL_SRC}
         ${FILES})
 
-find_library (
-        binder_ndk-lib
-        binder_ndk
-)
-
 target_link_libraries(v4a_re log binder_ndk) # kissfft)
 target_compile_options(v4a_re PRIVATE -flto -O3 -DNDEBUG)
 #target_compile_options(v4afx_r PRIVATE -O2 -DNDEBUG -Wall -Wsign-conversion -Wno-unused-result -Wno-unneeded-internal-declaration -fstrict-aliasing -fvisibility=hidden -Wextra -Wno-unused-parameter)