fix: correctly get device abi

farfromrefug · farfromrefug · commit 0b2d85ce9bdd · 2022-10-10T11:14:54.000+02:00
diff --git a/lib/services/android/gradle-build-service.ts b/lib/services/android/gradle-build-service.ts
@@ -34,8 +34,8 @@ export class GradleBuildService
 			if(buildData.emulator) {
 				devices = devices.filter(d=>d.isEmulator);
 			}
-			const abis = devices.map(d=>d.deviceInfo.abis[0]);
-			if (abis.length > 0) {
+			const abis = devices.map(d=>d.deviceInfo.abis.filter(a=>!!a && a.length)[0]).filter(a=>!!a);
+			if (abis.length > 0 && buildTaskArgs.findIndex(b=>b.startsWith('-PabiFilters')) === -1) {
 				buildTaskArgs.push(`-PabiFilters=${abis.join(',')}`);
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ export class GradleBuildService`
`34`	`34`	`if(buildData.emulator) {`
`35`	`35`	`devices = devices.filter(d=>d.isEmulator);`
`36`	`36`	`}`
`37`		`- const abis = devices.map(d=>d.deviceInfo.abis[0]);`
`38`		`- if (abis.length > 0) {`
	`37`	`+ const abis = devices.map(d=>d.deviceInfo.abis.filter(a=>!!a && a.length)[0]).filter(a=>!!a);`
	`38`	`+ if (abis.length > 0 && buildTaskArgs.findIndex(b=>b.startsWith('-PabiFilters')) === -1) {`
`39`	`39`	buildTaskArgs.push(`-PabiFilters=${abis.join(',')}`);
`40`	`40`	`}`
`41`	`41`	`}`