Skip to content

Commit 1de883f

Browse files
committed
(multi-os-engine/multi-os-engine#161) Move isHostAARCH64 to NativeUtil
1 parent 289529c commit 1de883f

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

src/main/java/org/moe/gradle/tasks/Dex2Oat.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.gradle.api.tasks.Internal;
2525
import org.gradle.api.tasks.OutputFile;
2626
import org.gradle.api.tasks.SourceSet;
27+
import org.moe.common.utils.NativeUtil;
2728
import org.moe.gradle.MoeExtension;
2829
import org.moe.gradle.MoePlugin;
2930
import org.moe.gradle.MoeSDK;
@@ -36,7 +37,6 @@
3637
import org.moe.gradle.utils.Arch;
3738
import org.moe.gradle.utils.Mode;
3839
import org.moe.gradle.utils.Require;
39-
import org.moe.gradle.utils.TaskUtils;
4040

4141
import java.io.File;
4242
import java.io.IOException;
@@ -268,7 +268,7 @@ protected void run() {
268268
} else {
269269
exec(spec -> {
270270
// Set executable
271-
if (TaskUtils.isHostAARCH64() && !Arch.FAMILY_ARM64.equalsIgnoreCase(getArchFamily())) {
271+
if (NativeUtil.isHostAARCH64() && !Arch.FAMILY_ARM64.equalsIgnoreCase(getArchFamily())) {
272272
// Run dex2oat using rosetta 2 when compiling non-arm64 target on Apple silicon
273273
// because currently the arm64 version of dex2oat does not work reliably due to
274274
// the issue of word size & alignment mismatch.

src/main/java/org/moe/gradle/utils/TaskUtils.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.gradle.process.ExecSpec;
2929
import org.gradle.process.JavaExecSpec;
3030
import org.moe.gradle.AbstractMoePlugin;
31-
import org.moe.gradle.MoePlugin;
3231
import org.moe.gradle.anns.NotNull;
3332
import org.moe.gradle.anns.Nullable;
3433
import org.moe.gradle.groovy.closures.TaskClosure;
@@ -47,11 +46,6 @@ public class TaskUtils {
4746
private TaskUtils() {
4847
}
4948

50-
public static boolean isHostAARCH64() {
51-
String arch = System.getProperty("os.arch");
52-
return arch != null && arch.toLowerCase().contains("aarch64");
53-
}
54-
5549
public static void assertSize(@NotNull List<String> elements, int count, @NotNull String desc) {
5650
Require.nonNull(elements);
5751
Require.GE(count, 0, null);

0 commit comments

Comments
 (0)