Skip to content

Commit 0183520

Browse files
committed
chore: prevent native rebuild when building for universal
1 parent 6686227 commit 0183520

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

lib/services/android-project-service.ts

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -936,21 +936,25 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
936936
}
937937
// check if we already build this arch
938938
// if not we need to say native has changed
939-
const device = this.$devicesService
940-
.getDevicesForPlatform(deviceDescriptor.buildData.platform)
941-
.filter(
942-
(d) => d.deviceInfo.identifier === deviceDescriptor.identifier
943-
)[0];
944-
const abis = device.deviceInfo.abis.filter((a) => !!a && a.length)[0];
945939

946940
const directoryContent = this.$fs.readDirectory(apkOutputPath);
947-
const regexp = new RegExp(`${abis}.*\.apk`);
948-
const files = _.filter(directoryContent, (entry: string) => {
949-
return regexp.test(entry);
950-
});
951-
if (files.length === 0) {
952-
changesInfo.nativeChanged = true;
941+
// if we are building for universal we should not check for missing abi apks
942+
if (!directoryContent.find(f=>f.indexOf("universal") !== -1)) {
943+
const device = this.$devicesService
944+
.getDevicesForPlatform(deviceDescriptor.buildData.platform)
945+
.filter(
946+
(d) => d.deviceInfo.identifier === deviceDescriptor.identifier
947+
)[0];
948+
const abis = device.deviceInfo.abis.filter((a) => !!a && a.length)[0];
949+
const regexp = new RegExp(`${abis}.*\.apk`);
950+
const files = _.filter(directoryContent, (entry: string) => {
951+
return regexp.test(entry);
952+
});
953+
if (files.length === 0) {
954+
changesInfo.nativeChanged = true;
955+
}
953956
}
957+
954958
}
955959
});
956960
}

0 commit comments

Comments
 (0)