diff options
| -rw-r--r-- | src/android/app/build.gradle.kts | 13 | ||||
| -rw-r--r-- | src/android/settings.gradle.kts | 6 |
2 files changed, 17 insertions, 2 deletions
diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts index 87d815c92c..18529242f5 100644 --- a/src/android/app/build.gradle.kts +++ b/src/android/app/build.gradle.kts @@ -18,6 +18,7 @@ plugins { id("androidx.navigation.safeargs.kotlin") id("org.jlleitschuh.gradle.ktlint") version "11.4.0" 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 edenDir = project(":Eden").projectDir + @Suppress("UnstableApiUsage") android { namespace = "org.yuzu.yuzu_emu" @@ -241,11 +244,17 @@ android { externalNativeBuild { cmake { 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.() { delete(File(layout.buildDirectory.toString() + File.separator + "intermediates/ktLint")) @@ -346,7 +355,7 @@ fun getGitVersion(): String { } afterEvaluate { - val artifactsDir = layout.projectDirectory.dir("../../../artifacts") + val artifactsDir = layout.projectDirectory.dir("${edenDir}/artifacts") val outputsDir = layout.buildDirectory.dir("outputs").get() android.applicationVariants.forEach { variant -> diff --git a/src/android/settings.gradle.kts b/src/android/settings.gradle.kts index af910b9068..2520d64591 100644 --- a/src/android/settings.gradle.kts +++ b/src/android/settings.gradle.kts @@ -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-License-Identifier: GPL-3.0-or-later @@ -19,3 +22,6 @@ dependencyResolutionManagement { } include(":app") + +include("Eden") +project(":Eden").projectDir = file("../..") |