From d575151a6e6d7982186facef5f56282595c8cc93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 6 Nov 2022 09:24:35 +0100 Subject: [PATCH 1/2] Yet another gradle upgrade --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index bfad5c1419..d9fc3ebd95 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.1' + classpath 'com.android.tools.build:gradle:7.3.1' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0b74ce0881..86463708b7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,6 +3,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip android.useAndroidX=true android.enableJetifier=true From 4d815060469eb15aabf64144df923ae678bfa5e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 6 Nov 2022 09:44:06 +0100 Subject: [PATCH 2/2] Upgrade gradle, specify NDK version in android/build.gradle Also fix a warning. --- Common/VR/PPSSPPVR.cpp | 2 +- Common/VR/PPSSPPVR.h | 4 ++-- android/build.gradle | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Common/VR/PPSSPPVR.cpp b/Common/VR/PPSSPPVR.cpp index 5007672b01..712ee9290d 100644 --- a/Common/VR/PPSSPPVR.cpp +++ b/Common/VR/PPSSPPVR.cpp @@ -103,7 +103,7 @@ bool IsVRBuild() { } #if PPSSPP_PLATFORM(ANDROID) -void InitVROnAndroid(void* vm, void* activity, const char* system, int version, char* name) { +void InitVROnAndroid(void* vm, void* activity, const char* system, int version, const char* name) { //Get device vendor (uppercase) char vendor[64]; diff --git a/Common/VR/PPSSPPVR.h b/Common/VR/PPSSPPVR.h index f6e2eefb27..65a14158ff 100644 --- a/Common/VR/PPSSPPVR.h +++ b/Common/VR/PPSSPPVR.h @@ -21,7 +21,7 @@ enum VRCompatFlag { // VR app flow integration bool IsVRBuild(); -void InitVROnAndroid(void* vm, void* activity, const char* system, int version, char* name); +void InitVROnAndroid(void* vm, void* activity, const char* system, int version, const char* name); void EnterVR(bool firstStart, void* vulkanContext); void GetVRResolutionPerEye(int* width, int* height); void UpdateVRInput(bool(*NativeKey)(const KeyInput &key), bool(*NativeTouch)(const TouchInput &touch), bool haptics, float dp_xscale, float dp_yscale); @@ -50,7 +50,7 @@ void UpdateVRView(float* leftEye, float* rightEye); // VR app flow integration inline bool IsVRBuild() { return false; } -inline void InitVROnAndroid(void* vm, void* activity, const char* system, int version, char* name) {} +inline void InitVROnAndroid(void* vm, void* activity, const char* system, int version, const char* name) {} inline void EnterVR(bool firstTime, void* vulkanContext) {} inline void GetVRResolutionPerEye(int* width, int* height) {} inline void UpdateVRInput(bool(*NativeKey)(const KeyInput &key), bool(*NativeTouch)(const TouchInput &touch), bool haptics, float dp_xscale, float dp_yscale) {} diff --git a/android/build.gradle b/android/build.gradle index 47eef16fd7..3ee429208b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -45,6 +45,8 @@ android { } } compileSdkVersion 32 + ndkVersion "21.4.7075529" + defaultConfig { applicationId 'org.ppsspp.ppsspp' if (androidGitVersion.name() != "unknown" && androidGitVersion.code() >= 14000000) {