Clean glib dependencies in Android Aitt

[Problem] glib is needed no more in Android if posix
          MainLoopHandler is introduced.
[Solution] Remove glib-related code used in Android Aitt.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b45e847fd4e5bdcc45190f81c244b44fbeaa92a0..78374e62577161f0f33d15261c7e67bb0b8e7f57 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,6 @@ IF(PLATFORM STREQUAL "android")
        ADD_DEFINITIONS(-DANDROID)
        ADD_DEFINITIONS(-DPLATFORM=${PLATFORM})
        INCLUDE(${PROJECT_ROOT_DIR}/cmake/aitt_android_flatbuffers.cmake)
-       INCLUDE(${PROJECT_ROOT_DIR}/cmake/aitt_android_glib.cmake)
        INCLUDE(${PROJECT_ROOT_DIR}/cmake/aitt_android_mosquitto.cmake)
        SET(AITT_NEEDS_LIBRARIES ${GLIB_LIBRARIES} ${MOSQUITTO_LIBRARY} ${FLATBUFFERS_LIBRARY} ${LOG_LIBRARIES})
 ELSE(PLATFORM STREQUAL "android")

diff --git a/android/aitt-native/build.gradle b/android/aitt-native/build.gradle
index e0a159478e28b705978766ad338db0bc52692782..5f94ff065efc96e0d9bab61c742088a6b8bdf95c 100644 (file)
--- a/android/aitt-native/build.gradle
+++ b/android/aitt-native/build.gradle
@@ -33,7 +33,6 @@ android {
                 arguments '-DVERSIONING=OFF'
                 arguments '-DPLATFORM=android'
                 arguments '-DCOVERAGE=OFF'
-                arguments '-DUSE_GLIB=1'
                 abiFilters 'arm64-v8a', 'x86'
                 cppFlags "-std=c++17"
                 targets "aitt-native", "aitt-transport-tcp"

diff --git a/cmake/aitt_android_glib.cmake b/cmake/aitt_android_glib.cmake
deleted file mode 100644 (file)
index 44c6618..0000000
--- a/cmake/aitt_android_glib.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-if(CMAKE_VERSION VERSION_LESS "3.10.0")
-    if(DEFINED AITT_ANDROID_GLIB)
-        return()
-    endif()
-    set(AITT_ANDROID_GLIB TRUE)
-else(CMAKE_VERSION VERSION_LESS "3.10.0")
-    include_guard(GLOBAL)
-endif(CMAKE_VERSION VERSION_LESS "3.10.0")
-
-if(ANDROID_ABI STREQUAL "arm64-v8a")
-    set(GSTREAMER_ABI arm64)
-elseif(ANDROID_ABI STREQUAL "armeabi-v7a")
-    set(GSTREAMER_ABI armv7)
-else(ANDROID_ABI STREQUAL "armeabi-v7a")
-    set(GSTREAMER_ABI ${ANDROID_ABI})
-endif(ANDROID_ABI STREQUAL "arm64-v8a")
-
-include_directories(
-        ${GSTREAMER_ROOT_ANDROID}/${GSTREAMER_ABI}/include/glib-2.0
-        ${GSTREAMER_ROOT_ANDROID}/${GSTREAMER_ABI}/lib/glib-2.0/include
-)
-
-link_directories(${GSTREAMER_ROOT_ANDROID}/${GSTREAMER_ABI}/lib)
-
-set(GLIB_LIBRARIES ${GSTREAMER_ROOT_ANDROID}/${GSTREAMER_ABI}/lib/libglib-2.0.a
-        ${GSTREAMER_ROOT_ANDROID}/${GSTREAMER_ABI}/lib/libiconv.a
-        ${GSTREAMER_ROOT_ANDROID}/${GSTREAMER_ABI}/lib/libintl.a)

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index ba496eb97b12a2623c75aba93cf1e8ebce58a905..ca5d97e75ac8225a07a9067f6485abc0e9314343 100644 (file)
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -4,7 +4,10 @@ IF(USE_GLIB)
        ADD_LIBRARY(${AITT_COMMON} SHARED ${COMMON_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/glib/MainLoopHandler.cc)
 ELSE(USE_GLIB)
        ADD_LIBRARY(${AITT_COMMON} SHARED ${COMMON_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/posix/MainLoopHandler.cc)
-       TARGET_LINK_LIBRARIES(${AITT_COMMON} rt)
+
+       IF(NOT PLATFORM STREQUAL "android")
+               TARGET_LINK_LIBRARIES(${AITT_COMMON} rt)
+       ENDIF()
 ENDIF(USE_GLIB)
 
 TARGET_LINK_LIBRARIES(${AITT_COMMON} ${AITT_NEEDS_LIBRARIES} Threads::Threads)

diff --git a/tools/android_env.sh b/tools/android_env.sh
index 07c5a04390f614bb42dfff998fd8618719eef9f4..8a774e0a7f6802182a0a92081e55963f045d68d1 100755 (executable)
--- a/tools/android_env.sh
+++ b/tools/android_env.sh
@@ -23,15 +23,6 @@ if [ ! $ANDROID_NDK_ROOT ]; then
        fi
 fi
 
-if [ ! -e "${HOME}/Android/gstreamer-1.0" ]; then
-       mkdir -p ${HOME}/Android/gstreamer-1.0
-       curl -sL https://gstreamer.freedesktop.org/data/pkg/android/1.20.0/gstreamer-1.0-android-universal-1.20.0.tar.xz | tar -C ${HOME}/Android/gstreamer-1.0 -xJ
-fi
-
-if [ ! $GSTREAMER_ROOT_ANDROID ]; then
-       echo "export GSTREAMER_ROOT_ANDROID=\$HOME/Android/gstreamer-1.0" >> ~/.profile
-fi
-
 if [ ! -e "$HOME/.sdkman/bin/sdkman-init.sh" ]; then
        curl -s "https://get.sdkman.io" | bash
 fi