diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts index b03ae732d4..64af986c7d 100644 --- a/src/android/app/build.gradle.kts +++ b/src/android/app/build.gradle.kts @@ -69,9 +69,6 @@ android { abiFilters += listOf("arm64-v8a") } - buildConfigField("String", "GIT_HASH", "\"${getGitHash()}\"") - buildConfigField("String", "BRANCH", "\"${getBranch()}\"") - externalNativeBuild { cmake { val extraCMakeArgs = @@ -326,9 +323,3 @@ fun getGitVersion(): String { } return versionName.ifEmpty { "0.0" } } - -fun getGitHash(): String = - runGitCommand(listOf("git", "rev-parse", "--short", "HEAD")).ifEmpty { "dummy-hash" } - -fun getBranch(): String = - runGitCommand(listOf("git", "rev-parse", "--abbrev-ref", "HEAD")).ifEmpty { "dummy-hash" } diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt index 18ace18393..4b93e36254 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt @@ -227,6 +227,11 @@ object NativeLibrary { */ external fun isUpdateCheckerEnabled(): Boolean + /** + * Returns the build version generated by CMake (BUILD_VERSION). + */ + external fun getBuildVersion(): String + enum class CoreError { ErrorSystemFiles, ErrorSavestate, diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt index 88ec13dd4c..452dd6636c 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt @@ -78,11 +78,15 @@ class AboutFragment : Fragment() { binding.root.findNavController().navigate(R.id.action_aboutFragment_to_licensesFragment) } - binding.textVersionName.text = BuildConfig.VERSION_NAME + val buildName = getString(R.string.app_name_suffixed) + val buildVersion = NativeLibrary.getBuildVersion() + val fullVersionText = "$buildName ($buildVersion)" + + binding.textVersionName.text = fullVersionText binding.buttonVersionName.setOnClickListener { val clipBoard = requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager - val clip = ClipData.newPlainText(getString(R.string.build), BuildConfig.GIT_HASH) + val clip = ClipData.newPlainText(getString(R.string.build), fullVersionText) clipBoard.setPrimaryClip(clip) if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) { diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index ffef4f740c..b0a414d1c3 100644 --- a/src/android/app/src/main/jni/native.cpp +++ b/src/android/app/src/main/jni/native.cpp @@ -1615,4 +1615,10 @@ JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_getUpdateUrl( } #endif +JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_getBuildVersion( + JNIEnv* env, + [[maybe_unused]] jobject obj) { + return env->NewStringUTF(Common::g_build_version); +} + } // extern "C"