Browse Source
[android] Improve about the build
Signed-off-by: Caio Oliveira <caiooliveirafarias0@gmail.com>
pull/3066/head
DraVee
3 months ago
committed by
Caio Oliveira
No known key found for this signature in database
GPG Key ID: 362DA3DC1901E080
4 changed files with
17 additions and
11 deletions
-
src/android/app/build.gradle.kts
-
src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt
-
src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt
-
src/android/app/src/main/jni/native.cpp
|
|
@ -69,9 +69,6 @@ android { |
|
|
abiFilters += listOf("arm64-v8a") |
|
|
abiFilters += listOf("arm64-v8a") |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
buildConfigField("String", "GIT_HASH", "\"${getGitHash()}\"") |
|
|
|
|
|
buildConfigField("String", "BRANCH", "\"${getBranch()}\"") |
|
|
|
|
|
|
|
|
|
|
|
externalNativeBuild { |
|
|
externalNativeBuild { |
|
|
cmake { |
|
|
cmake { |
|
|
val extraCMakeArgs = |
|
|
val extraCMakeArgs = |
|
|
@ -326,9 +323,3 @@ fun getGitVersion(): String { |
|
|
} |
|
|
} |
|
|
return versionName.ifEmpty { "0.0" } |
|
|
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" } |
|
|
|
|
|
@ -227,6 +227,11 @@ object NativeLibrary { |
|
|
*/ |
|
|
*/ |
|
|
external fun isUpdateCheckerEnabled(): Boolean |
|
|
external fun isUpdateCheckerEnabled(): Boolean |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* Returns the build version generated by CMake (BUILD_VERSION). |
|
|
|
|
|
*/ |
|
|
|
|
|
external fun getBuildVersion(): String |
|
|
|
|
|
|
|
|
enum class CoreError { |
|
|
enum class CoreError { |
|
|
ErrorSystemFiles, |
|
|
ErrorSystemFiles, |
|
|
ErrorSavestate, |
|
|
ErrorSavestate, |
|
|
|
|
|
@ -78,11 +78,15 @@ class AboutFragment : Fragment() { |
|
|
binding.root.findNavController().navigate(R.id.action_aboutFragment_to_licensesFragment) |
|
|
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 { |
|
|
binding.buttonVersionName.setOnClickListener { |
|
|
val clipBoard = |
|
|
val clipBoard = |
|
|
requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager |
|
|
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) |
|
|
clipBoard.setPrimaryClip(clip) |
|
|
|
|
|
|
|
|
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) { |
|
|
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) { |
|
|
|
|
|
@ -1615,4 +1615,10 @@ JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_getUpdateUrl( |
|
|
} |
|
|
} |
|
|
#endif
|
|
|
#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"
|
|
|
} // extern "C"
|