test

jakedowns · Jan 11, 2024 · 8e6b93f · 8e6b93f
1 parent 6b6ec3b
commit 8e6b93f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts
@@ -270,6 +270,7 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
     implementation("androidx.preference:preference-ktx:1.2.1")
     implementation("io.coil-kt:coil:2.2.2")
+    implementation(files("src/android/cnsdk-android-0.7.28/samples/leia/lwEngine/tests/androidJava/src/main/java/com/leia/lwe/java.sample.LWE_Core.java"))
     addSdkDependency(false)
 }
 

diff --git a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.kt b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.kt
@@ -11,6 +11,7 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.content.pm.PackageManager
 import android.net.Uri
+import android.opengl.GLSurfaceView
 import android.os.Bundle
 import android.view.InputDevice
 import android.view.KeyEvent
@@ -42,6 +43,7 @@ import org.citra.citra_emu.utils.ForegroundService
 import org.citra.citra_emu.utils.EmulationLifecycleUtil
 import org.citra.citra_emu.utils.ThemeUtil
 import org.citra.citra_emu.viewmodel.EmulationViewModel
+import com.leia.lwe.java.sample.LWE_Core
 
 private class LWERenderer(val activity: Activity) : GLSurfaceView.Renderer, AutoCloseable {
 	private val TAG = LWERenderer::class.java.simpleName

diff --git a/src/android/app/src/main/jni/CMakeLists.txt b/src/android/app/src/main/jni/CMakeLists.txt
@@ -53,7 +53,7 @@ if ("arm64" IN_LIST ARCHITECTURE)
     target_link_libraries(citra-android PRIVATE adrenotools)
 endif()
 
-target_link_libraries(citra-android CNSDK::leiaSDK)
+target_link_libraries(citra-android PRIVATE CNSDK::leiaSDK)
 
 set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} citra-android)
 
diff --git a/src/android/build.gradle.kts b/src/android/build.gradle.kts
@@ -4,8 +4,8 @@
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.1.2" apply false
-    id("com.android.library") version "8.1.2" apply false
+    id("com.android.application") version "8.2.1" apply false
+    id("com.android.library") version "8.2.1" apply false
     id("org.jetbrains.kotlin.android") version "1.8.21" apply false
     id("org.jetbrains.kotlin.plugin.serialization") version "1.8.21"
 }

diff --git a/...es/leia/lwEngine/tests/androidJava/src/main/java/com/leia/lwe/java/sample/MainActivity.kt b/...es/leia/lwEngine/tests/androidJava/src/main/java/com/leia/lwe/java/sample/MainActivity.kt
@@ -68,7 +68,7 @@ private class LWERenderer(val activity: Activity) : GLSurfaceView.Renderer, Auto
 		this.width = width
 		this.height = height
 		this.isSizeDirty = true
-}
+	}
 
 	override fun onDrawFrame(p0: GL10?) {
 		Log.d(TAG, "onDrawFrame")

diff --git a/src/android/gradle/wrapper/gradle-wrapper.properties b/src/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip