Include android project into the sources

FWGS · Nov 20, 2024 · cd3dc78 · cd3dc78
1 parent ddf5a01
commit cd3dc78
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 76 deletions.
diff --git a/android/.gitmodules b/android/.gitmodules
diff --git a/android/app/build.gradle.kts b/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()
-}
+}
diff --git a/android/app/src/main/cpp/CMakeLists.txt b/android/app/src/main/cpp/CMakeLists.txt
diff --git a/android/app/src/main/cpp/SDL b/android/app/src/main/cpp/SDL
diff --git a/android/app/src/main/cpp/hlsdk-portable b/android/app/src/main/cpp/hlsdk-portable
diff --git a/android/app/src/main/cpp/xash3d-fwgs b/android/app/src/main/cpp/xash3d-fwgs
diff --git a/scripts/gha/deps_android.sh b/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