Browse Source
Merge pull request #10945 from t895/android-14
android: Android 14 support
pull/15/merge
bunnei
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
6 additions and
3 deletions
-
src/android/app/build.gradle.kts
-
src/android/app/src/main/AndroidManifest.xml
|
|
@ -26,7 +26,7 @@ val autoVersion = (((System.currentTimeMillis() / 1000) - 1451606400) / 10).toIn |
|
|
android { |
|
|
android { |
|
|
namespace = "org.yuzu.yuzu_emu" |
|
|
namespace = "org.yuzu.yuzu_emu" |
|
|
|
|
|
|
|
|
compileSdkVersion = "android-33" |
|
|
|
|
|
|
|
|
compileSdkVersion = "android-34" |
|
|
ndkVersion = "25.2.9519653" |
|
|
ndkVersion = "25.2.9519653" |
|
|
|
|
|
|
|
|
buildFeatures { |
|
|
buildFeatures { |
|
|
@ -51,7 +51,7 @@ android { |
|
|
// TODO If this is ever modified, change application_id in strings.xml |
|
|
// TODO If this is ever modified, change application_id in strings.xml |
|
|
applicationId = "org.yuzu.yuzu_emu" |
|
|
applicationId = "org.yuzu.yuzu_emu" |
|
|
minSdk = 30 |
|
|
minSdk = 30 |
|
|
targetSdk = 33 |
|
|
|
|
|
|
|
|
targetSdk = 34 |
|
|
versionName = getGitVersion() |
|
|
versionName = getGitVersion() |
|
|
|
|
|
|
|
|
// If you want to use autoVersion for the versionCode, create a property in local.properties |
|
|
// If you want to use autoVersion for the versionCode, create a property in local.properties |
|
|
|
|
|
@ -13,6 +13,7 @@ SPDX-License-Identifier: GPL-3.0-or-later |
|
|
|
|
|
|
|
|
<uses-permission android:name="android.permission.INTERNET" /> |
|
|
<uses-permission android:name="android.permission.INTERNET" /> |
|
|
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> |
|
|
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> |
|
|
|
|
|
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" /> |
|
|
<uses-permission android:name="android.permission.NFC" /> |
|
|
<uses-permission android:name="android.permission.NFC" /> |
|
|
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> |
|
|
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> |
|
|
|
|
|
|
|
|
@ -69,7 +70,9 @@ SPDX-License-Identifier: GPL-3.0-or-later |
|
|
android:resource="@xml/nfc_tech_filter" /> |
|
|
android:resource="@xml/nfc_tech_filter" /> |
|
|
</activity> |
|
|
</activity> |
|
|
|
|
|
|
|
|
<service android:name="org.yuzu.yuzu_emu.utils.ForegroundService"/> |
|
|
|
|
|
|
|
|
<service android:name="org.yuzu.yuzu_emu.utils.ForegroundService" android:foregroundServiceType="specialUse"> |
|
|
|
|
|
<property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE" android:value="Keep emulation running in background"/> |
|
|
|
|
|
</service> |
|
|
|
|
|
|
|
|
<provider |
|
|
<provider |
|
|
android:name=".features.DocumentProvider" |
|
|
android:name=".features.DocumentProvider" |
|
|
|