From ed8ffecc0990fd1198210ccbfdd63c6616616711 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Fri, 16 Oct 2026 12:10:24 +0000 Subject: [PATCH] feat: Add Android ARM64-v8a support & APK build workflow Co-authored-by: ClausValcaTD <193546948+ClausValcaTD@users.noreply.github.com> --- .github/workflows/Android.yml | 56 ++++++++++++++++++ core/lib/src/config.dart | 18 +++++- gui/.metadata | 8 +-- gui/android/.gitignore | 14 +++++ gui/android/app/build.gradle.kts | 48 +++++++++++++++ gui/android/app/src/debug/AndroidManifest.xml | 7 +++ gui/android/app/src/main/AndroidManifest.xml | 51 ++++++++++++++++ .../kotlin/com/m5dev/openrom/MainActivity.kt | 20 +++++++ .../res/drawable-v21/launch_background.xml | 12 ++++ .../main/res/drawable/launch_background.xml | 12 ++++ .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 544 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 442 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 721 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 1031 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 1443 bytes .../app/src/main/res/values-night/styles.xml | 18 ++++++ .../app/src/main/res/values/styles.xml | 18 ++++++ .../app/src/profile/AndroidManifest.xml | 7 +++ gui/android/build.gradle.kts | 24 ++++++++ gui/android/gradle.properties | 2 + .../gradle/wrapper/gradle-wrapper.properties | 5 ++ gui/android/settings.gradle.kts | 26 ++++++++ gui/lib/main.dart | 49 ++++++++++----- gui/lib/utils/config.dart | 5 ++ 24 files changed, 376 insertions(+), 24 deletions(-) create mode 100644 .github/workflows/Android.yml create mode 100644 gui/android/.gitignore create mode 100644 gui/android/app/build.gradle.kts create mode 100644 gui/android/app/src/debug/AndroidManifest.xml create mode 100644 gui/android/app/src/main/AndroidManifest.xml create mode 100644 gui/android/app/src/main/kotlin/com/m5dev/openrom/MainActivity.kt create mode 100644 gui/android/app/src/main/res/drawable-v21/launch_background.xml create mode 100644 gui/android/app/src/main/res/drawable/launch_background.xml create mode 100644 gui/android/app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 gui/android/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 gui/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 gui/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 gui/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 gui/android/app/src/main/res/values-night/styles.xml create mode 100644 gui/android/app/src/main/res/values/styles.xml create mode 100644 gui/android/app/src/profile/AndroidManifest.xml create mode 100644 gui/android/build.gradle.kts create mode 100644 gui/android/gradle.properties create mode 100644 gui/android/gradle/wrapper/gradle-wrapper.properties create mode 100644 gui/android/settings.gradle.kts diff --git a/.github/workflows/Android.yml b/.github/workflows/Android.yml new file mode 100644 index 0000000..5961466 --- /dev/null +++ b/.github/workflows/Android.yml @@ -0,0 +1,56 @@ +name: Android APK Build + +on: + workflow_dispatch: + release: + types: [published] + +permissions: + contents: read + +jobs: + build-android: + name: Build Android APK (ARM64) + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Fetch binaries from OpenROM-bins + run: | + git clone https://github.com/M5Devs/OpenROM-bins.git bins + (cd bins && tr -d '\r' < checksums.sha256 | sha256sum -c -) + + - name: Prepare jniLibs + run: | + mkdir -p gui/android/app/src/main/jniLibs/arm64-v8a + for f in bins/android/arm64-v8a/*; do + if [ -f "$f" ]; then + b=$(basename "$f") + cp "$f" "gui/android/app/src/main/jniLibs/arm64-v8a/lib${b}.so" + fi + done + chmod +x gui/android/app/src/main/jniLibs/arm64-v8a/* + + - name: Set up Java 17 + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '17' + + - name: Set up Flutter + uses: subosito/flutter-action@v2 + with: + channel: 'stable' + + - name: Build APK + run: | + cd gui + flutter pub get + flutter build apk --release --target-platform android-arm64 + + - name: Upload APK artifact + uses: actions/upload-artifact@v4 + with: + name: OpenROM-Android-arm64 + path: gui/build/app/outputs/flutter-apk/app-release.apk diff --git a/core/lib/src/config.dart b/core/lib/src/config.dart index 80aa930..2d16b7a 100644 --- a/core/lib/src/config.dart +++ b/core/lib/src/config.dart @@ -8,6 +8,12 @@ import 'package:path/path.dart' as p; const String appName = 'OpenROM'; +String? _androidNativeLibDir; + +Future initAndroid(String libDir) async { + _androidNativeLibDir = libDir; +} + String getDirectoryConfig() { String path; if (Platform.isWindows) { @@ -34,7 +40,8 @@ String get configFile => p.join(getDirectoryConfig(), 'config.json'); Map? _configCache; void ensureExecutable(String filePath) { - if ((Platform.isLinux || Platform.isMacOS) && File(filePath).existsSync()) { + if ((Platform.isLinux || Platform.isMacOS || Platform.isAndroid) && + File(filePath).existsSync()) { try { Process.runSync('chmod', ['+x', filePath]); } catch (_) {} @@ -189,6 +196,15 @@ bool saveConfig(Map config) { } String getToolPath(String tool) { + if (Platform.isAndroid) { + if (_androidNativeLibDir != null && _androidNativeLibDir!.isNotEmpty) { + final libPath = p.join(_androidNativeLibDir!, 'lib$tool.so'); + ensureExecutable(libPath); + return libPath; + } + return 'lib$tool.so'; + } + final config = loadConfig(); final val = config[tool] as String? ?? ''; if (val.isNotEmpty && (File(val).existsSync() || p.isAbsolute(val))) { diff --git a/gui/.metadata b/gui/.metadata index 4328837..05a325e 100644 --- a/gui/.metadata +++ b/gui/.metadata @@ -15,13 +15,7 @@ migration: - platform: root create_revision: 90673a4eef275d1a6692c26ac80d6d746d41a73a base_revision: 90673a4eef275d1a6692c26ac80d6d746d41a73a - - platform: linux - create_revision: 90673a4eef275d1a6692c26ac80d6d746d41a73a - base_revision: 90673a4eef275d1a6692c26ac80d6d746d41a73a - - platform: macos - create_revision: 90673a4eef275d1a6692c26ac80d6d746d41a73a - base_revision: 90673a4eef275d1a6692c26ac80d6d746d41a73a - - platform: windows + - platform: android create_revision: 90673a4eef275d1a6692c26ac80d6d746d41a73a base_revision: 90673a4eef275d1a6692c26ac80d6d746d41a73a diff --git a/gui/android/.gitignore b/gui/android/.gitignore new file mode 100644 index 0000000..be3943c --- /dev/null +++ b/gui/android/.gitignore @@ -0,0 +1,14 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java +.cxx/ + +# Remember to never publicly share your keystore. +# See https://flutter.dev/to/reference-keystore +key.properties +**/*.keystore +**/*.jks diff --git a/gui/android/app/build.gradle.kts b/gui/android/app/build.gradle.kts new file mode 100644 index 0000000..6dd4023 --- /dev/null +++ b/gui/android/app/build.gradle.kts @@ -0,0 +1,48 @@ +plugins { + id("com.android.application") + id("kotlin-android") + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id("dev.flutter.flutter-gradle-plugin") +} + +android { + namespace = "com.m5dev.openrom" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_17.toString() + } + + defaultConfig { + applicationId = "com.m5dev.openrom" + minSdk = 26 + targetSdk = 34 + versionCode = flutter.versionCode + versionName = flutter.versionName + ndk { + abiFilters.add("arm64-v8a") + } + } + + sourceSets { + getByName("main") { + jniLibs.srcDirs("src/main/jniLibs") + } + } + + buildTypes { + release { + signingConfig = signingConfigs.getByName("debug") + } + } +} + +flutter { + source = "../.." +} diff --git a/gui/android/app/src/debug/AndroidManifest.xml b/gui/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/gui/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/gui/android/app/src/main/AndroidManifest.xml b/gui/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..3b1ee37 --- /dev/null +++ b/gui/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gui/android/app/src/main/kotlin/com/m5dev/openrom/MainActivity.kt b/gui/android/app/src/main/kotlin/com/m5dev/openrom/MainActivity.kt new file mode 100644 index 0000000..e75b412 --- /dev/null +++ b/gui/android/app/src/main/kotlin/com/m5dev/openrom/MainActivity.kt @@ -0,0 +1,20 @@ +package com.m5dev.openrom + +import io.flutter.embedding.android.FlutterActivity +import io.flutter.embedding.engine.FlutterEngine +import io.flutter.plugin.common.MethodChannel + +class MainActivity: FlutterActivity() { + private val CHANNEL = "com.m5dev.openrom/native" + + override fun configureFlutterEngine(flutterEngine: FlutterEngine) { + super.configureFlutterEngine(flutterEngine) + MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL).setMethodCallHandler { call, result -> + if (call.method == "getNativeLibraryDir") { + result.success(applicationInfo.nativeLibraryDir) + } else { + result.notImplemented() + } + } + } +} diff --git a/gui/android/app/src/main/res/drawable-v21/launch_background.xml b/gui/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f74085f --- /dev/null +++ b/gui/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/gui/android/app/src/main/res/drawable/launch_background.xml b/gui/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 0000000..304732f --- /dev/null +++ b/gui/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/gui/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/gui/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..db77bb4b7b0906d62b1847e87f15cdcacf6a4f29 GIT binary patch literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U|N3vA*22NaGQG zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#iqdw@AL`7MR}m`rwr|mZgU`8P7SBkL78fFf!WnuYWm$5Z0 zNXhDbCv&49sM544K|?c)WrFfiZvCi9h0O)B3Pgg&ebxsLQ05GG~ AQ2+n{ literal 0 HcmV?d00001 diff --git a/gui/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/gui/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..17987b79bb8a35cc66c3c1fd44f5a5526c1b78be GIT binary patch literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q03KywUtLX8Ua?`H+NMzkczFPK3lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l zytQ?X=U+MF$@3 zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+ yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@Uy!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R` zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg zoq1^2_p9@|WEo z*X_Uko@K)qYYv~>43eQGMdbiGbo>E~Q& zrYBH{QP^@Sti!`2)uG{irBBq@y*$B zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N zdG@vOZB4v_lF7Plrx+hxo7(fCV&}fHq)$ literal 0 HcmV?d00001 diff --git a/gui/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/gui/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..d5f1c8d34e7a88e3f88bea192c3a370d44689c3c GIT binary patch literal 1031 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFa`(sgt!6~Yi|1%a`XoT0ojZ}lNrNjb9xjc(B0U1_% zz5^97Xt*%oq$rQy4?0GKNfJ44uvxI)gC`h-NZ|&0-7(qS@?b!5r36oQ}zyZrNO3 zMO=Or+<~>+A&uN&E!^Sl+>xE!QC-|oJv`ApDhqC^EWD|@=#J`=d#Xzxs4ah}w&Jnc z$|q_opQ^2TrnVZ0o~wh<3t%W&flvYGe#$xqda2bR_R zvPYgMcHgjZ5nSA^lJr%;<&0do;O^tDDh~=pIxA#coaCY>&N%M2^tq^U%3DB@ynvKo}b?yu-bFc-u0JHzced$sg7S3zqI(2 z#Km{dPr7I=pQ5>FuK#)QwK?Y`E`B?nP+}U)I#c1+FM*1kNvWG|a(TpksZQ3B@sD~b zpQ2)*V*TdwjFOtHvV|;OsiDqHi=6%)o4b!)x$)%9pGTsE z-JL={-Ffv+T87W(Xpooq<`r*VzWQcgBN$$`u}f>-ZQI1BB8ykN*=e4rIsJx9>z}*o zo~|9I;xof literal 0 HcmV?d00001 diff --git a/gui/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/gui/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..4d6372eebdb28e45604e46eeda8dd24651419bc0 GIT binary patch literal 1443 zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`YV6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY zB_MsH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~Lo9vl;Zfs+W#BydUw zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3 z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w! zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%4Q8~Mad z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt* zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW zu72MW`|?8ht^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf< zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$ zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+ zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f z%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP z(1P?z~7YxD~Rf<(a@_y` literal 0 HcmV?d00001 diff --git a/gui/android/app/src/main/res/values-night/styles.xml b/gui/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..06952be --- /dev/null +++ b/gui/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/gui/android/app/src/main/res/values/styles.xml b/gui/android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..cb1ef88 --- /dev/null +++ b/gui/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/gui/android/app/src/profile/AndroidManifest.xml b/gui/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/gui/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/gui/android/build.gradle.kts b/gui/android/build.gradle.kts new file mode 100644 index 0000000..dbee657 --- /dev/null +++ b/gui/android/build.gradle.kts @@ -0,0 +1,24 @@ +allprojects { + repositories { + google() + mavenCentral() + } +} + +val newBuildDir: Directory = + rootProject.layout.buildDirectory + .dir("../../build") + .get() +rootProject.layout.buildDirectory.value(newBuildDir) + +subprojects { + val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name) + project.layout.buildDirectory.value(newSubprojectBuildDir) +} +subprojects { + project.evaluationDependsOn(":app") +} + +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) +} diff --git a/gui/android/gradle.properties b/gui/android/gradle.properties new file mode 100644 index 0000000..fbee1d8 --- /dev/null +++ b/gui/android/gradle.properties @@ -0,0 +1,2 @@ +org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError +android.useAndroidX=true diff --git a/gui/android/gradle/wrapper/gradle-wrapper.properties b/gui/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e4ef43f --- /dev/null +++ b/gui/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip diff --git a/gui/android/settings.gradle.kts b/gui/android/settings.gradle.kts new file mode 100644 index 0000000..ca7fe06 --- /dev/null +++ b/gui/android/settings.gradle.kts @@ -0,0 +1,26 @@ +pluginManagement { + val flutterSdkPath = + run { + val properties = java.util.Properties() + file("local.properties").inputStream().use { properties.load(it) } + val flutterSdkPath = properties.getProperty("flutter.sdk") + require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" } + flutterSdkPath + } + + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id("dev.flutter.flutter-plugin-loader") version "1.0.0" + id("com.android.application") version "8.11.1" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false +} + +include(":app") diff --git a/gui/lib/main.dart b/gui/lib/main.dart index 1b1a01e..45e4219 100644 --- a/gui/lib/main.dart +++ b/gui/lib/main.dart @@ -1,7 +1,11 @@ // OpenROM — Universal ROM Compression Suite // M5 Dev | GPL v3 +import 'dart:io'; + import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:openrom_core/openrom_core.dart' as core; import 'package:window_manager/window_manager.dart'; import 'app.dart'; @@ -11,22 +15,35 @@ import 'services/theme_service.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); - try { - await windowManager.ensureInitialized(); - const windowOptions = WindowOptions( - size: Size(1100, 720), - minimumSize: Size(800, 500), - center: true, - backgroundColor: Colors.transparent, - skipTaskbar: false, - title: 'OpenROM — Universal ROM Compression Suite', - ); - windowManager.waitUntilReadyToShow(windowOptions, () async { - await windowManager.show(); - await windowManager.focus(); - }); - } catch (_) { - // Window manager setup fallback if headlessly executing or uninitialized + if (Platform.isAndroid) { + try { + const channel = MethodChannel('com.m5dev.openrom/native'); + final String? libDir = + await channel.invokeMethod('getNativeLibraryDir'); + if (libDir != null && libDir.isNotEmpty) { + await core.initAndroid(libDir); + } + } catch (e) { + debugPrint('Failed to initialize Android native library dir: $e'); + } + } else { + try { + await windowManager.ensureInitialized(); + const windowOptions = WindowOptions( + size: Size(1100, 720), + minimumSize: Size(800, 500), + center: true, + backgroundColor: Colors.transparent, + skipTaskbar: false, + title: 'OpenROM — Universal ROM Compression Suite', + ); + windowManager.waitUntilReadyToShow(windowOptions, () async { + await windowManager.show(); + await windowManager.focus(); + }); + } catch (_) { + // Window manager setup fallback if headlessly executing or uninitialized + } } final themeService = ThemeService(); diff --git a/gui/lib/utils/config.dart b/gui/lib/utils/config.dart index 033f51b..9741ee6 100644 --- a/gui/lib/utils/config.dart +++ b/gui/lib/utils/config.dart @@ -3,10 +3,15 @@ import 'dart:io'; +import 'package:openrom_core/openrom_core.dart' as core; + class AppConfig { /// Resolves tool binary path relative to executable. /// Windows: `.exe`, Linux/macOS: `` static String getToolPath(String toolName) { + if (Platform.isAndroid) { + return core.getToolPath(toolName); + } final exeDir = File(Platform.resolvedExecutable).parent.path; final binaryName = Platform.isWindows ? '$toolName.exe' : toolName; return '$exeDir${Platform.pathSeparator}$binaryName';