Improve windows compatibility

maoabc · maoabc · commit 33a5cf047ce4 · 2021-06-19T18:39:02.000+08:00
diff --git a/nmm-protect/apkprotect/src/main/java/com/nmmedit/apkprotect/ApkProtect.java b/nmm-protect/apkprotect/src/main/java/com/nmmedit/apkprotect/ApkProtect.java
@@ -159,7 +159,7 @@ public void run() throws IOException {
     private void addFileToZip(ZipOutputStream zipOutput, File file, ZipEntry zipEntry) throws IOException {
         zipOutput.putNextEntry(zipEntry);
         try (FileInputStream input = new FileInputStream(file);) {
-            copyStream(input, zipOutput);
+            FileUtils.copyStream(input, zipOutput);
         }
         zipOutput.closeEntry();
     }
@@ -227,18 +227,18 @@ private static List<String> getAbis(File apk) throws IOException {
         if (abis.isEmpty()) {
             //默认只生成armeabi-v7a
             ArrayList<String> abi = new ArrayList<>();
-            if(Prefs.isArm()) {
+            if (Prefs.isArm()) {
                 abi.add("armeabi-v7a");
             }
-            if(Prefs.isArm64()) {
+            if (Prefs.isArm64()) {
                 abi.add("arm64-v8a");
             }
 
-            if(Prefs.isX86()) {
+            if (Prefs.isX86()) {
                 abi.add("x86");
             }
 
-            if(Prefs.isX64()) {
+            if (Prefs.isX64()) {
                 abi.add("x86_64");
             }
             return abi;
@@ -247,10 +247,19 @@ private static List<String> getAbis(File apk) throws IOException {
     }
 
     private void generateCSources(String packageName) throws IOException {
-        final List<File> cSources = ApkUtils.extractFiles(
-                new File(FileUtils.getHomePath(), "tools/vmsrc.zip"), ".*", apkFolders.getDex2cSrcDir()
+        final File vmsrcFile = new File(FileUtils.getHomePath(), "tools/vmsrc.zip");
+        if (!vmsrcFile.exists()) {
+            vmsrcFile.getParentFile().mkdirs();
+            //copy vmsrc.zip to external directory
+            try (
+                    InputStream inputStream = ApkProtect.class.getResourceAsStream("/vmsrc.zip");
+                    final FileOutputStream outputStream = new FileOutputStream(vmsrcFile);
+            ) {
+                FileUtils.copyStream(inputStream, outputStream);
+            }
+        }
+        final List<File> cSources = ApkUtils.extractFiles(vmsrcFile, ".*", apkFolders.getDex2cSrcDir());
 
-        );
         //处理指令及apk验证,生成新的c文件
         for (File source : cSources) {
             if (source.getName().endsWith("DexOpcodes.h")) {
@@ -576,7 +585,7 @@ private static void zipCopy(ZipInputStream zipInputStream, File tempDir, ZipOutp
             zipOutputStream.putNextEntry(zipEntry);
 
             try (final FileInputStream fileIn = new FileInputStream(fileObj.file)) {
-                copyStream(fileIn, zipOutputStream);
+                FileUtils.copyStream(fileIn, zipOutputStream);
             }
             zipOutputStream.closeEntry();
         }
@@ -613,13 +622,6 @@ private static long copyStreamCalcCrc32(InputStream in, OutputStream out) throws
         return crc32.getValue();
     }
 
-    private static void copyStream(InputStream in, OutputStream out) throws IOException {
-        byte[] buf = new byte[4 * 1024];
-        int len;
-        while ((len = in.read(buf)) != -1) {
-            out.write(buf, 0, len);
-        }
-    }
 
     private static class FileObj {
         private final File file;
diff --git a/nmm-protect/apkprotect/src/main/java/com/nmmedit/apkprotect/BuildNativeLib.java b/nmm-protect/apkprotect/src/main/java/com/nmmedit/apkprotect/BuildNativeLib.java
@@ -125,17 +125,10 @@ public String getAbi() {
             return abi;
         }
 
-        public String getVmLibOutputDir() {
-            return new File(new File(getProjectHome(), ".cxx/cmake/Release"), abi + File.separator + "vm").getAbsolutePath();
-        }
-
         public String getLibOutputDir() {
             return new File(new File(getProjectHome(), "obj"), abi).getAbsolutePath();
         }
 
-        public String getVpLibOutputDir() {
-            return new File(new File(getProjectHome(), ".cxx/cmake/Release"), abi).getAbsolutePath();
-        }
 
         //camke --build <BuildPath>
         public String getBuildPath() {
@@ -148,16 +141,16 @@ public String getStripBinaryPath() {
             switch (abi) {
                 case "armeabi-v7a":
                         return new File(getNdkHome(), "/toolchains/arm-linux-androideabi-4.9/prebuilt/" +
-                                Prefs.ndkToolchains() + "/bin/arm-linux-androideabi-strip").getAbsolutePath();
+                                Prefs.getOsName() + "/bin/arm-linux-androideabi-strip").getAbsolutePath();
                 case "arm64-v8a":
                         return new File(getNdkHome(), "/toolchains/aarch64-linux-android-4.9/prebuilt/" +
-                                Prefs.ndkToolchains() + "/bin/aarch64-linux-android-strip").getAbsolutePath();
+                                Prefs.getOsName() + "/bin/aarch64-linux-android-strip").getAbsolutePath();
                 case "x86":
                         return new File(getNdkHome(), "/toolchains/x86-4.9/prebuilt/" +
-                                Prefs.ndkToolchains() + "/bin/i686-linux-android-strip").getAbsolutePath();
+                                Prefs.getOsName() + "/bin/i686-linux-android-strip").getAbsolutePath();
                 case "x86_64":
                         return new File(getNdkHome(), "/toolchains/x86_64-4.9/prebuilt/" +
-                                Prefs.ndkToolchains() + "/bin/x86_64-linux-android-strip").getAbsolutePath();
+                                Prefs.getOsName() + "/bin/x86_64-linux-android-strip").getAbsolutePath();
             }
             //不支持arm和x86以外的abi
             throw new RuntimeException("Unsupported abi " + abi);
@@ -194,8 +187,8 @@ public List<String> getCmakeArguments() {
         //最后输出的so文件
         public List<File> getSharedObjectFile() {
             return Arrays.asList(
-                    new File(getVmLibOutputDir(), "libnmmvm.so"),
-                    new File(getVpLibOutputDir(), "libnmmp.so")
+                    new File(getLibOutputDir(), "libnmmvm.so"),
+                    new File(getLibOutputDir(), "libnmmp.so")
             );
         }
 
diff --git a/nmm-protect/apkprotect/src/main/java/com/nmmedit/apkprotect/data/Prefs.java b/nmm-protect/apkprotect/src/main/java/com/nmmedit/apkprotect/data/Prefs.java
@@ -3,18 +3,34 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.nmmedit.apkprotect.data.config.Config;
-import com.nmmedit.apkprotect.data.config.Constants;
 import com.nmmedit.apkprotect.util.FileUtils;
+import com.nmmedit.apkprotect.util.OsDetector;
 
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 
 public class Prefs {
+    public static final String CONFIG_PATH = new File(FileUtils.getHomePath(), "tools/config.json").getAbsolutePath();
+
     public static Config config() {
+        final File configFile = new File(CONFIG_PATH);
+        if (!configFile.exists()) {
+            configFile.getParentFile().mkdirs();
+            try (
+                    final InputStream inputStream = Prefs.class.getResourceAsStream("/" + (OsDetector.isWindows() ? "config-windows.json" : "config.json"));
+                    final FileOutputStream outputStream = new FileOutputStream(configFile);
+            ) {
+                FileUtils.copyStream(inputStream, outputStream);
+            } catch (IOException e) {
+            }
+        }
         GsonBuilder builder = new GsonBuilder();
         Gson gson = builder.create();
         try {
-            String content = FileUtils.readFile(Constants.CONFIG_PATH, StandardCharsets.UTF_8);
+            String content = FileUtils.readFile(CONFIG_PATH, StandardCharsets.UTF_8);
             return gson.fromJson(content, Config.class);
         } catch (IOException e) {
             e.printStackTrace();
@@ -50,7 +66,7 @@ public static String ndkPath() {
         return config().path.ndk;
     }
 
-    public static String ndkToolchains() {
-        return config().ndk.toolchains;
+    public static String getOsName() {
+        return config().ndk.osName;
     }
 }
diff --git a/nmm-protect/apkprotect/src/main/java/com/nmmedit/apkprotect/data/config/Constants.java b/nmm-protect/apkprotect/src/main/java/com/nmmedit/apkprotect/data/config/Constants.java
diff --git a/nmm-protect/apkprotect/src/main/java/com/nmmedit/apkprotect/data/config/NdkConfig.java b/nmm-protect/apkprotect/src/main/java/com/nmmedit/apkprotect/data/config/NdkConfig.java
@@ -3,6 +3,6 @@
 import com.google.gson.annotations.SerializedName;
 
 public class NdkConfig {
-    @SerializedName("toolchains")
-    public String toolchains;
+    @SerializedName("os_name")
+    public String osName;
 }
diff --git a/nmm-protect/apkprotect/src/main/java/com/nmmedit/apkprotect/util/FileUtils.java b/nmm-protect/apkprotect/src/main/java/com/nmmedit/apkprotect/util/FileUtils.java
@@ -2,6 +2,8 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.URISyntaxException;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
@@ -28,4 +30,12 @@ public static String readFile(String path, Charset encoding) throws IOException
         byte[] encoded = Files.readAllBytes(Paths.get(path));
         return new String(encoded, encoding);
     }
+
+    public static void copyStream(InputStream in, OutputStream out) throws IOException {
+        byte[] buf = new byte[4 * 1024];
+        int len;
+        while ((len = in.read(buf)) != -1) {
+            out.write(buf, 0, len);
+        }
+    }
 }
diff --git a/nmm-protect/apkprotect/src/main/java/com/nmmedit/apkprotect/util/OsDetector.java b/nmm-protect/apkprotect/src/main/java/com/nmmedit/apkprotect/util/OsDetector.java
@@ -0,0 +1,13 @@
+package com.nmmedit.apkprotect.util;
+
+public class OsDetector {
+
+    public static boolean isWindows() {
+        final String osName = System.getProperty("os.name");
+        if (osName == null) {
+            return false;
+        }
+        return osName.toLowerCase().contains("windows");
+    }
+
+}
diff --git a/nmm-protect/apkprotect/src/main/resources/config-windows.json b/nmm-protect/apkprotect/src/main/resources/config-windows.json
@@ -15,6 +15,6 @@
     // Indicate under which platform the NDK is installed
     "ndk": {
         // For Linux: linux-x86_64
-        "toolchains":"windows-x86_64" // E:\Android\Sdk\ndk\22.0.7026061\toolchains\arm-linux-androideabi-4.9\prebuilt\windows-x86_64\bin
+        "os_name":"windows-x86_64" // E:\Android\Sdk\ndk\22.0.7026061\toolchains\arm-linux-androideabi-4.9\prebuilt\windows-x86_64\bin
     }
 }
diff --git a/nmm-protect/apkprotect/src/main/resources/config.json b/nmm-protect/apkprotect/src/main/resources/config.json
@@ -0,0 +1,19 @@
+{
+  // Choose under which architecture you need to build C++ libraries
+  "abi": {
+    "armeabi-v7a": true,
+    "arm64-v8a": false,
+    "x86": true,
+    "x86_64": false
+  },
+  // If you do not have environment variables set, enter the path to SDK, NDK and CMAKE
+  "path": {
+    "sdk": "/opt/android-sdk",
+    "cmake": "/opt/android-sdk/cmake/3.18.1",
+    "ndk": "/opt/android-sdk/ndk/22.1.7171670"
+  },
+  // Indicate under which platform the NDK is installed
+  "ndk": {
+    "os_name": "linux-x86_64"
+  }
+}
diff --git a/nmm-protect/out/artifacts/nmm_protect_jar/tools/vmsrc.zip b/nmm-protect/out/artifacts/nmm_protect_jar/tools/vmsrc.zip

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`import com.google.gson.annotations.SerializedName;`
`4`	`4`
`5`	`5`	`public class NdkConfig {`
`6`		`- @SerializedName("toolchains")`
`7`		`- public String toolchains;`
	`6`	`+ @SerializedName("os_name")`
	`7`	`+ public String osName;`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@`
`15`	`15`	`// Indicate under which platform the NDK is installed`
`16`	`16`	`"ndk": {`
`17`	`17`	`// For Linux: linux-x86_64`
`18`		`- "toolchains":"windows-x86_64" // E:\Android\Sdk\ndk\22.0.7026061\toolchains\arm-linux-androideabi-4.9\prebuilt\windows-x86_64\bin`
	`18`	`+ "os_name":"windows-x86_64" // E:\Android\Sdk\ndk\22.0.7026061\toolchains\arm-linux-androideabi-4.9\prebuilt\windows-x86_64\bin`
`19`	`19`	`}`
`20`	`20`	`}`