Fix android gradle file

armory3d · Nov 12, 2024 · eea2d0b · eea2d0b
1 parent 0cf9085
commit eea2d0b
Showing 1 changed file with 26 additions and 26 deletions.
diff --git a/armorcore/tools/make.js b/armorcore/tools/make.js
@@ -1983,33 +1983,33 @@ class AndroidExporter extends Exporter {
 		gradle = gradle.replace(/{compileSdkVersion}/g, target_options.compileSdkVersion.toString());
 		gradle = gradle.replace(/{minSdkVersion}/g, target_options.minSdkVersion.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..
-		// 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);
 		// cppflags = '-frtti -fexceptions ' + cppflags;
 		// cppflags = '-std=' + project.cppStd + ' ' + cppflags;