From 5690dfb65b95682b7ee93f1d9e48d5eeba51e53e Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Sat, 21 Jan 2023 00:40:03 +0100
Subject: [PATCH] cmake: don't install Android.mk files for Android
---
.github/workflows/android.yml | 5 -----
CMakeLists.txt | 12 ------------
cmake/test/jni/Android.mk | 10 ----------
3 files changed, 27 deletions(-)
delete mode 100644 cmake/test/jni/Android.mk
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index b83da712e5ce..8f3b41146641 100644
--- a/.github/workflows/android.yml
+++ b/.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
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 070853780a03..887dac996011 100644
--- a/CMakeLists.txt
+++ b/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(
diff --git a/cmake/test/jni/Android.mk b/cmake/test/jni/Android.mk
deleted file mode 100644
index 9acbb783d86d..000000000000
--- a/cmake/test/jni/Android.mk
+++ /dev/null
@@ -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)