camerin
/
eden
mirror of https://git.eden-emu.dev/eden-emu/eden.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[android] Properly set Root of the Project (#3177) 

Signed-off-by: Caio Oliveira <caiooliveirafarias0@gmail.com>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3177
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Reviewed-by: Lizzie <lizzie@eden-emu.dev>
Co-authored-by: Caio Oliveira <caiooliveirafarias0@gmail.com>
Co-committed-by: Caio Oliveira <caiooliveirafarias0@gmail.com>
This commit is contained in:
Caio Oliveira 2025-12-23 22:23:56 +01:00 committed by crueter
parent fbd28a9d34
commit 00ec67d65b
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/android/app/build.gradle.kts
View File

@ -18,6 +18,7 @@ plugins {
id("androidx.navigation.safeargs.kotlin") id("androidx.navigation.safeargs.kotlin")
id("org.jlleitschuh.gradle.ktlint") version "11.4.0" id("org.jlleitschuh.gradle.ktlint") version "11.4.0"
id("com.github.triplet.play") version "3.8.6" id("com.github.triplet.play") version "3.8.6"
id("idea")
} }
/** /**
@ -27,6 +28,8 @@ plugins {
*/ */
val autoVersion = (((System.currentTimeMillis() / 1000) - 1451606400) / 10).toInt() val autoVersion = (((System.currentTimeMillis() / 1000) - 1451606400) / 10).toInt()
val edenDir = project(":Eden").projectDir
@Suppress("UnstableApiUsage") @Suppress("UnstableApiUsage")
android { android {
namespace = "org.yuzu.yuzu_emu" namespace = "org.yuzu.yuzu_emu"
@ -241,11 +244,17 @@ android {
externalNativeBuild { externalNativeBuild {
cmake { cmake {
version = "3.22.1" version = "3.22.1"
path = file("../../../CMakeLists.txt") path = file("${edenDir}/CMakeLists.txt")
} }
} }
} }
idea {
module {
// Inclusion to exclude build/ dir from non-Android
excludeDirs.add(file("${edenDir}/build"))
}
}
tasks.register<Delete>("ktlintReset", fun Delete.() { tasks.register<Delete>("ktlintReset", fun Delete.() {
delete(File(layout.buildDirectory.toString() + File.separator + "intermediates/ktLint")) delete(File(layout.buildDirectory.toString() + File.separator + "intermediates/ktLint"))
@ -346,7 +355,7 @@ fun getGitVersion(): String {
} }
afterEvaluate { afterEvaluate {
val artifactsDir = layout.projectDirectory.dir("../../../artifacts") val artifactsDir = layout.projectDirectory.dir("${edenDir}/artifacts")
val outputsDir = layout.buildDirectory.dir("outputs").get() val outputsDir = layout.buildDirectory.dir("outputs").get()
android.applicationVariants.forEach { variant -> android.applicationVariants.forEach { variant ->

6
src/android/settings.gradle.kts
View File

@ -1,3 +1,6 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
@ -19,3 +22,6 @@ dependencyResolutionManagement {
} }
include(":app") include(":app")
include("Eden")
project(":Eden").projectDir = file("../..")