Merge pull request #15 from Berstanio/fix-armv7-remotebuild

Run dex2oat with rosetta on m1 remote machine (armv7)

Author: Noisyfox

src/main/java/org/moe/gradle/remote/Server.java

@@ -99,6 +99,14 @@ public URI getSdkDir() {
         return Require.nonNull(sdkDir);
     }
 
+    @Nullable
+    private Boolean remoteAARCH64;
+
+    @NotNull
+    public boolean isRemoteAARCH64() {
+        return Require.nonNull(remoteAARCH64);
+    }
+
     @Nullable
     private Task moeRemoteServerSetupTask;
 
@@ -202,13 +210,19 @@ public void connect() {
                     throw new GradleException(e.getMessage(), e);
                 }
 
+                fetchArchitecture();
                 setupUserHome();
                 setupBuildDir();
                 prepareServerMOE();
             });
         });
     }
 
+    private void fetchArchitecture() {
+        String arch = exec("get arch", "arch");
+        remoteAARCH64 = arch.equals("arm64");
+    }
+
     private void prepareServerMOE() {
         final MoeSDK sdk = plugin.getSDK();
 

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

@@ -249,7 +249,12 @@ protected void run() {
                     "mkdir -p `dirname " + remoteDestArt + "` && " +
                     "mkdir -p `dirname " + remoteDestOat + "`");
 
-            remoteServer.exec("dex2oat", dex2oatExec + " " +
+            String optionalRosetta = "";
+            if (remoteServer.isRemoteAARCH64() && !Arch.FAMILY_ARM64.equalsIgnoreCase(getArchFamily())) {
+                optionalRosetta = "arch --x86_64 ";
+            }
+
+            remoteServer.exec("dex2oat", optionalRosetta + dex2oatExec + " " +
                     "--instruction-set=" + Arch.validateArchFamily(getArchFamily()) + " " +
                     "--base=0x" + Long.toHexString(getBase()) + " " +
                     "--compiler-backend=" + validateBackend(getCompilerBackend()) + " " +