Include android project into the sources

android/.gitmodules

@@ -1,11 +0,0 @@
-[submodule "hlsdk-portable"]
-	path = app/src/main/cpp/hlsdk-portable
-	url = https://github.com/FWGS/hlsdk-portable
-	branch = mobile_hacks
-[submodule "xash3d-fwgs"]
-	path = app/src/main/cpp/xash3d-fwgs
-	url = https://github.com/FWGS/xash3d-fwgs
-[submodule "SDL"]
-	path = app/src/main/cpp/SDL
-	url = https://github.com/libsdl-org/SDL
-	branch = release-2.24.1

android/app/build.gradle.kts

@@ -31,7 +31,7 @@ android {
     externalNativeBuild {
         cmake {
             version = "3.22.1"
-            path = file("${project.projectDir}/src/main/cpp/CMakeLists.txt")
+            path = file("${project.projectDir}/CMakeLists.txt")
         }
     }
 
@@ -75,9 +75,9 @@ android {
 
     sourceSets {
         getByName("main") {
-            assets.srcDir("${project.projectDir}/src/main/cpp/xash3d-fwgs/3rdparty/extras/xash-extras")
+            assets.srcDir("${project.projectDir}/../../3rdparty/xash-extras")
             assets.srcDir("${project.projectDir}/../moddb")
-            java.srcDir("${project.projectDir}/src/main/cpp/SDL/android-project/app/src/main/java")
+            java.srcDir("${project.projectDir}/../../3rdparty/SDL/android-project/app/src/main/java")
         }
     }
 
@@ -127,4 +127,4 @@ fun getBuildNum(): Int {
     val qBuildNum = releaseDate.until(now, ChronoUnit.DAYS)
     val minuteOfDay = now.hour * 60 + now.minute
     return (qBuildNum * 10000 + minuteOfDay).toInt()
-}
+}

android/app/src/main/cpp/CMakeLists.txt

@@ -1,41 +0,0 @@
-cmake_minimum_required(VERSION 3.6)
-
-project(XASH_ANDROID)
-
-# armeabi-v7a requires cpufeatures library
-include(AndroidNdkModules)
-android_ndk_import_module_cpufeatures()
-
-find_package(PythonInterp 2.7 REQUIRED)
-
-get_filename_component(C_COMPILER_ID ${CMAKE_C_COMPILER} NAME_WE)
-get_filename_component(CXX_COMPILER_ID ${CMAKE_CXX_COMPILER} NAME_WE)
-
-if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-	set(BUILD_TYPE "debug")
-else()
-	set(BUILD_TYPE "release")
-endif()
-
-set(CMAKE_VERBOSE_MAKEFILE ON)
-
-set(WAF_CC "${CMAKE_C_COMPILER} --target=${CMAKE_C_COMPILER_TARGET}")
-set(WAF_CXX "${CMAKE_CXX_COMPILER} --target=${CMAKE_CXX_COMPILER_TARGET}")
-
-execute_process(
-		COMMAND ${CMAKE_COMMAND} -E env
-		CC=${WAF_CC} CXX=${WAF_CXX}
-		AR=${CMAKE_AR} STRIP=${CMAKE_STRIP}
-		${PYTHON_EXECUTABLE} waf configure -vvv -T ${BUILD_TYPE} cmake
-		--check-c-compiler=${C_COMPILER_ID} --check-cxx-compiler=${CXX_COMPILER_ID}
-		-s "${CMAKE_CURRENT_SOURCE_DIR}/SDL" --skip-sdl2-sanity-check
-		WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/xash3d-fwgs"
-)
-
-if(CMAKE_SIZEOF_VOID_P MATCHES "8")
-	set(64BIT ON CACHE BOOL "" FORCE)
-endif()
-add_subdirectory("hlsdk-portable")
-add_subdirectory("SDL")
-add_subdirectory("xash3d-fwgs")
-add_subdirectory("xash3d-fwgs/3rdparty/mainui")

android/app/src/main/cpp/SDL

@@ -1 +0,0 @@
-Subproject commit 2eef7ca475decd2b864214cdbfe72b143b16d459

android/app/src/main/cpp/hlsdk-portable

@@ -1 +0,0 @@
-Subproject commit 0d8a19fd82758746cc41af5e18946a9410e4533f

android/app/src/main/cpp/xash3d-fwgs

@@ -1 +0,0 @@
-Subproject commit 1c84a5c8ade7cfac17d6b558669d4f721a0bf11f

scripts/gha/deps_android.sh

@@ -8,13 +8,12 @@ ANDROID_PLATFORM_VER="android-34"
 ANDROID_NDK_VER="26.3.11579264"
 
 echo "Download JDK 17"
-wget https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz -qO jdk.tar.gz || exit 1
-tar -xzf jdk.tar.gz
+wget https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz -qO- | tar -xzvf - || exit 1
 export JAVA_HOME=$GITHUB_WORKSPACE/jdk-17.0.7+7
 export PATH=$PATH:$JAVA_HOME/bin
 
 echo "Download hlsdk-portable"
-git clone --depth 1 --recursive https://github.com/FWGS/hlsdk-portable -b mobile_hacks hlsdk || exit 1
+git clone --depth 1 --recursive https://github.com/FWGS/hlsdk-portable -b mobile_hacks 3rdparty/hlsdk-portable || exit 1
 
 echo "Download Android SDK"
 mkdir -p sdk || exit 1
@@ -32,17 +31,3 @@ popd
 echo "Download all needed tools and Android NDK"
 yes | sdkmanager --licenses > /dev/null 2>/dev/null # who even reads licenses? :)
 sdkmanager --install build-tools\;${ANDROID_BUILD_TOOLS_VER} platform-tools platforms\;${ANDROID_PLATFORM_VER} ndk\;${ANDROID_NDK_VER}
-
-echo "Download Xash3D FWGS Android source code"
-git clone --depth 1 --recursive https://github.com/FWGS/xash3d-android-project -b gradle android || exit 1
-pushd android/app/src/main/cpp
-
-mv xash3d-fwgs xash3d-fwgs-sub
-ln -s $GITHUB_WORKSPACE xash3d-fwgs
-echo "Installed Xash3D FWGS source symlink"
-
-mv hlsdk-portable hlsdk-portable-sub
-ln -s $GITHUB_WORKSPACE/hlsdk hlsdk-portable
-echo "Installed hlsdk-portable source symlink"
-
-popd