edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix android gradle file

Browse Source
This commit is contained in:
luboslenco
2024-11-12 19:09:35 +01:00
parent 0cf9085852
commit eea2d0bdd9
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
armorcore/tools/make.js
+26 -26
View File
@@ -1983,33 +1983,33 @@ class AndroidExporter extends Exporter {
gradle = gradle.replace(/{compileSdkVersion}/g, target_options.compileSdkVersion.toString()); gradle = gradle.replace(/{compileSdkVersion}/g, target_options.compileSdkVersion.toString());
gradle = gradle.replace(/{minSdkVersion}/g, target_options.minSdkVersion.toString()); gradle = gradle.replace(/{minSdkVersion}/g, target_options.minSdkVersion.toString());
gradle = gradle.replace(/{targetSdkVersion}/g, target_options.targetSdkVersion.toString()); gradle = gradle.replace(/{targetSdkVersion}/g, target_options.targetSdkVersion.toString());
let arch = '';
if (target_options.abiFilters.length > 0) {
for (let item of target_options.abiFilters) {
if (arch.length === 0) {
arch = '"' + item + '"';
}
else {
arch = arch + ', "' + item + '"';
}
}
arch = `ndk { abiFilters += listOf(${arch}) }`;
}
else {
switch (goptions.arch) {
case 'default':
arch = '';
break;
case 'arm8':
arch = 'arm64-v8a';
break;
}
if (goptions.arch !== 'default') {
arch = `ndk {abiFilters += listOf("${arch}")}`;
}
}
gradle = gradle.replace(/{architecture}/g, arch);
// Looks like these should go into CMakeLists.txt now.. // Looks like these should go into CMakeLists.txt now..
// let arch = '';
// if (target_options.abiFilters.length > 0) {
// for (let item of target_options.abiFilters) {
// if (arch.length === 0) {
// arch = '"' + item + '"';
// }
// else {
// arch = arch + ', "' + item + '"';
// }
// }
// arch = `ndk { abiFilters += listOf(${arch}) }`;
// }
// else {
// switch (goptions.arch) {
// case 'default':
// arch = '';
// break;
// case 'arm8':
// arch = 'arm64-v8a';
// break;
// }
// if (goptions.arch !== 'default') {
// arch = `ndk {abiFilters += listOf("${arch}")}`;
// }
// }
// gradle = gradle.replace(/{architecture}/g, arch);
// gradle = gradle.replace(/{cflags}/g, cflags); // gradle = gradle.replace(/{cflags}/g, cflags);
// cppflags = '-frtti -fexceptions ' + cppflags; // cppflags = '-frtti -fexceptions ' + cppflags;
// cppflags = '-std=' + project.cppStd + ' ' + cppflags; // cppflags = '-std=' + project.cppStd + ' ' + cppflags;