Browse Source

cmake: don't install Android.mk files for Android

Anonymous Maarten 2 years ago
parent
commit
5690dfb65b
3 changed files with 0 additions and 27 deletions
  1. 0 5
      .github/workflows/android.yml
  2. 0 12
      CMakeLists.txt
  3. 0 10
      cmake/test/jni/Android.mk

+ 0 - 5
.github/workflows/android.yml

@@ -72,8 +72,3 @@ jobs:
           export CC="${{ steps.setup_ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=${{ matrix.platform.arch }}-none-linux-androideabi${{ matrix.platform.android_platform }}"
           export PKG_CONFIG_PATH=${{ env.SDL3_DIR }}/lib/pkgconfig
           cmake/test/test_pkgconfig.sh
-      - name: Verify Android.mk
-        if: ${{ matrix.platform.name == 'CMake' }}
-        run: |
-          export NDK_MODULE_PATH=${{ env.SDL3_DIR }}/share/ndk-modules
-          ndk-build -C ${{ github.workspace }}/cmake/test APP_PLATFORM=android-${{ matrix.platform.android_platform }} APP_ABI=${{ matrix.platform.android_abi }} NDK_OUT=$PWD NDK_LIBS_OUT=$PWD V=1

+ 0 - 12
CMakeLists.txt

@@ -3319,10 +3319,6 @@ if(NOT SDL_DISABLE_INSTALL)
       NAMESPACE SDL3::
       DESTINATION "${SDL_INSTALL_CMAKEDIR}"
     )
-    if(ANDROID AND NOT CMAKE_VERSION VERSION_LESS 3.7)
-      install(EXPORT_ANDROID_MK SDL3Targets
-        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/ndk-modules/SDL3")
-    endif()
   endif()
 
   if(SDL_STATIC)
@@ -3331,10 +3327,6 @@ if(NOT SDL_DISABLE_INSTALL)
       NAMESPACE SDL3::
       DESTINATION "${SDL_INSTALL_CMAKEDIR}"
     )
-    if(ANDROID AND NOT CMAKE_VERSION VERSION_LESS 3.7)
-      install(EXPORT_ANDROID_MK SDL3staticTargets
-        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/ndk-modules/SDL3-static")
-    endif()
   endif()
 
   if(SDL_TEST)
@@ -3343,10 +3335,6 @@ if(NOT SDL_DISABLE_INSTALL)
       NAMESPACE SDL3::
       DESTINATION "${SDL_INSTALL_CMAKEDIR}"
     )
-    if(ANDROID AND NOT CMAKE_VERSION VERSION_LESS 3.7)
-      install(EXPORT_ANDROID_MK SDL3testTargets
-        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/ndk-modules/SDL3_test")
-    endif()
   endif()
 
   install(

+ 0 - 10
cmake/test/jni/Android.mk

@@ -1,10 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := main_gui_androidmk
-LOCAL_SRC_FILES := ../main_gui.c
-LOCAL_SHARED_LIBRARIES += SDL3
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module,SDL3)