Fix build

Author: SSimco

.github/workflows/deploy_release_android.yml

@@ -42,10 +42,8 @@ jobs:
           BUILD_TYPE: ${{ inputs.build_type }}
         run: |
           cd ./src/android
-          if [[ -z "$ANDROID_STORE_FILE_BASE64" ]]; then
-            base64 --decode <<< "${ANDROID_STORE_FILE_BASE64}" > store.jks
-            export ANDROID_STORE_FILE=$(pwd)/store.jks
-          fi
+          base64 --decode <<< "${ANDROID_STORE_FILE_BASE64}" > store.jks
+          export ANDROID_KEYSTORE_FILE=$(pwd)/store.jks
           ./gradlew assemble$BUILD_TYPE
 
 

src/Cafe/HW/Espresso/Recompiler/BackendAArch64/BackendAArch64.cpp

@@ -789,13 +789,13 @@ void AArch64GenContext_t::conditionalJumpCycleCheck(IMLSegment* imlSegment)
 
 void ATTR_MS_ABI PPCRecompiler_getTBL(PPCInterpreter_t* ppcInterpreter, uint32 gprIndex)
 {
-	uint64 coreTime = coreinit::coreinit_getTimerTick();
+	uint64 coreTime = coreinit::OSGetSystemTime();
 	ppcInterpreter->gpr[gprIndex] = (uint32)(coreTime & 0xFFFFFFFF);
 }
 
 void ATTR_MS_ABI PPCRecompiler_getTBU(PPCInterpreter_t* ppcInterpreter, uint32 gprIndex)
 {
-	uint64 coreTime = coreinit::coreinit_getTimerTick();
+	uint64 coreTime = coreinit::OSGetSystemTime();
 	ppcInterpreter->gpr[gprIndex] = (uint32)((coreTime >> 32) & 0xFFFFFFFF);
 }
 

src/android/app/build.gradle.kts

@@ -29,7 +29,7 @@ val versionMinor: String? = System.getenv("EMULATOR_VERSION_MINOR")
 
 fun getVersionName(): String {
     if (versionMajor != null && versionMinor != null)
-        return "$versionMinor.$versionMinor"
+        return "$versionMajor.$versionMinor"
     return getGitHash() ?: "1.0"
 }
 
@@ -57,7 +57,7 @@ android {
                 storeFile = file(keystoreFilePath)
                 storePassword = System.getenv("ANDROID_KEY_STORE_PASSWORD")
                 keyAlias = System.getenv("ANDROID_KEY_ALIAS")
-                keyPassword = System.getenv("ANDROID_KEYSTORE_PASS")
+                keyPassword = System.getenv("ANDROID_KEY_STORE_PASSWORD")
             }
         }
     }
@@ -83,6 +83,11 @@ android {
                 signingConfig = signingConfigs.getByName("releaseSigningConfig")
             } else {
                 initWith(getByName("debug"))
+                externalNativeBuild {
+                    cmake {
+                        arguments.add("-DCMAKE_BUILD_TYPE=DEBUG")
+                    }
+                }
             }
         }
     }
@@ -108,6 +113,7 @@ android {
         "-DENABLE_SDL=OFF",
         "-DENABLE_WXWIDGETS=OFF",
         "-DENABLE_OPENGL=OFF",
+        "-DENABLE_BLUEZ=OFF",
         "-DBUNDLE_SPEEX=ON",
         "-DENABLE_DISCORD_RPC=OFF",
         "-DENABLE_NSYSHID_LIBUSB=OFF",
@@ -117,9 +123,7 @@ android {
     defaultConfig {
         externalNativeBuild {
             cmake {
-                arguments(
-                    *cmakeArguments
-                )
+                arguments.addAll(cmakeArguments)
                 abiFilters("arm64-v8a")
             }
         }

src/android/app/src/main/cpp/NativeEmulation.cpp

@@ -114,8 +114,8 @@ namespace NativeEmulation
 			{
 				return ERROR_GAME_BASE_FILES_NOT_FOUND;
 			}
-			CafeSystem::STATUS_CODE r = CafeSystem::PrepareForegroundTitle(baseTitleId);
-			if (r != CafeSystem::STATUS_CODE::SUCCESS)
+			CafeSystem::PREPARE_STATUS_CODE r = CafeSystem::PrepareForegroundTitle(baseTitleId);
+			if (r != CafeSystem::PREPARE_STATUS_CODE::SUCCESS)
 			{
 				return ERROR_UNKNOWN;
 			}
@@ -127,8 +127,8 @@ namespace NativeEmulation
 			CafeTitleFileType fileType = DetermineCafeSystemFileType(launchPath);
 			if (fileType == CafeTitleFileType::RPX || fileType == CafeTitleFileType::ELF)
 			{
-				CafeSystem::STATUS_CODE r = CafeSystem::PrepareForegroundTitleFromStandaloneRPX(launchPath);
-				if (r != CafeSystem::STATUS_CODE::SUCCESS)
+				CafeSystem::PREPARE_STATUS_CODE r = CafeSystem::PrepareForegroundTitleFromStandaloneRPX(launchPath);
+				if (r != CafeSystem::PREPARE_STATUS_CODE::SUCCESS)
 				{
 					return ERROR_UNKNOWN;
 				}

src/input/CMakeLists.txt

@@ -115,6 +115,6 @@ if(ENABLE_SDL)
 endif()
 
 
-if (UNIX AND NOT APPLE)
+if (UNIX AND NOT APPLE AND NOT ANDROID)
 	target_link_libraries(CemuInput PRIVATE bluez::bluez)
 endif ()

vcpkg.json

@@ -69,10 +69,7 @@
       "default-features": false,
       "features": ["jpeg", "zip"]
     },
-    {
-      "name": "libusb",
-      "platform": "!android"
-    }
+    "libusb"
   ],
   "overrides": [
     {