From bb2cbbfba3ba255c11953f2bcca912046519cfb1 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sat, 17 Dec 2022 23:25:46 -0800 Subject: android: Add Citra frontend. --- src/android/gradle.properties | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/android/gradle.properties (limited to 'src/android/gradle.properties') diff --git a/src/android/gradle.properties b/src/android/gradle.properties new file mode 100644 index 000000000..8de505811 --- /dev/null +++ b/src/android/gradle.properties @@ -0,0 +1,15 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true +org.gradle.jvmargs=-Xmx1536m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true -- cgit v1.2.3 From 834d53fbbfcaef45172f6f4dc57c7c41815ba071 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Mon, 6 Mar 2023 02:01:37 -0500 Subject: android: Enable Kotlin support --- src/android/gradle.properties | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/android/gradle.properties') diff --git a/src/android/gradle.properties b/src/android/gradle.properties index 8de505811..885e2af85 100644 --- a/src/android/gradle.properties +++ b/src/android/gradle.properties @@ -8,8 +8,6 @@ # The setting is particularly useful for tweaking memory settings. android.enableJetifier=true android.useAndroidX=true -org.gradle.jvmargs=-Xmx1536m -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true +org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official -- cgit v1.2.3 From 48065c7a0ec0cd37cbf37b3487af6103169d604e Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Thu, 4 May 2023 03:40:43 -0400 Subject: android: Enable non-transitive R classes New default going forward for new android projects. Best to follow the new standard. --- src/android/gradle.properties | 1 + 1 file changed, 1 insertion(+) (limited to 'src/android/gradle.properties') diff --git a/src/android/gradle.properties b/src/android/gradle.properties index 885e2af85..82b01e7d3 100644 --- a/src/android/gradle.properties +++ b/src/android/gradle.properties @@ -11,3 +11,4 @@ android.useAndroidX=true org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official +android.nonTransitiveRClass=true -- cgit v1.2.3 From 56d3711e349bfb74fbb9a8cb09a5f6c9cb6b5036 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Thu, 4 May 2023 04:07:44 -0400 Subject: android: Migrate to AGP 8.0.1 --- src/android/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/android/gradle.properties') diff --git a/src/android/gradle.properties b/src/android/gradle.properties index 82b01e7d3..4f4f20eb6 100644 --- a/src/android/gradle.properties +++ b/src/android/gradle.properties @@ -11,4 +11,4 @@ android.useAndroidX=true org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -android.nonTransitiveRClass=true +android.defaults.buildfeatures.buildconfig=true -- cgit v1.2.3 From c16e663f7037d7b0650c2c69d1bcd69dd65a0b7f Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Thu, 4 May 2023 04:13:47 -0400 Subject: android: Disable jetifier We no longer depend on any legacy libraries that required this flag --- src/android/gradle.properties | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/android/gradle.properties') diff --git a/src/android/gradle.properties b/src/android/gradle.properties index 4f4f20eb6..bf63cfce7 100644 --- a/src/android/gradle.properties +++ b/src/android/gradle.properties @@ -6,9 +6,8 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -android.enableJetifier=true -android.useAndroidX=true org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official android.defaults.buildfeatures.buildconfig=true -- cgit v1.2.3 From ee8caac82f8276dd6585042850c76373dd36ed69 Mon Sep 17 00:00:00 2001 From: bunnei Date: Tue, 30 May 2023 20:50:09 -0700 Subject: android: Various fixes for CI. --- src/android/gradle.properties | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/android/gradle.properties') diff --git a/src/android/gradle.properties b/src/android/gradle.properties index bf63cfce7..653a35ce8 100644 --- a/src/android/gradle.properties +++ b/src/android/gradle.properties @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2023 yuzu Emulator Project +# SPDX-License-Identifier: GPL-3.0-or-later + # Project-wide Gradle settings. # IDE (e.g. Android Studio) users: # Gradle settings configured through the IDE *will override* -- cgit v1.2.3