Merge pull request #9 from xianglin1998/master

fixed signature configuration input.
2026-05-12 11:19:59 -07:00 · 2019-09-27 20:36:04 +08:00
parent bff76fae06 cc8355f714
commit e6a63abf2d
25 changed files with 391 additions and 378 deletions
@@ -10,10 +10,10 @@ android {
        * if you need to compile your version, please replace your signature or delete this signature, using the default debug signature.
        * */
        release {
-            keyAlias System.getProperty("KEYALIAS_GLOBAL")
-            keyPassword System.getProperty("PASSWORD_GLOBAL")
-            storeFile file(System.getProperty("KEYSTORE_GLOBAL"))
-            storePassword System.getProperty("STOREKEY_GLOBAK")
+            keyAlias System.getProperty("KEYALIAS_GLOBAL") == null ? "keyAlias" : System.getProperty("KEYALIAS_GLOBAL")
+            keyPassword System.getProperty("PASSWORD_GLOBAL") == null ? "keyPassword" : System.getProperty("PASSWORD_GLOBAL")
+            storeFile file(System.getProperty("KEYSTORE_GLOBAL") == null ? "storeFile" : System.getProperty("KEYSTORE_GLOBAL"))
+            storePassword System.getProperty("STOREKEY_GLOBAK") == null ? "storePassword" : System.getProperty("STOREKEY_GLOBAK")
        }
    }
    //构建项目的sdk版本
@@ -3,77 +3,94 @@ import groovy.swing.SwingBuilder

 System.setProperty('java.awt.headless', 'false')

-task getReleasePassword {
-    if (System.console() == null) {
-        def tempKeyPassword = '';
-        def tempJksFile = '';
-        def tempAlias = '';
-        def tempStorePassword = '';
-        // 通过swing显示出一个密码框
-        new SwingBuilder().edt {
-            dialog(modal: true, title: 'KeyStore info', alwaysOnTop: true, resizable: false, locationRelativeTo: null, size: [500, 200], show: true,) {
-                vbox() { // Put everything below each other
-                    label(text: "alias(keystore):")
-                    // 获取输入的别名
-                    def input0 = textField()
+this.tasks.create(name: "getReleasePassword") {
+    // 我们直接访问同个目录下的模块名.iml文件，获取当前的build版本!
+    String path = getBuildFile().getParent()
+    File imlFile = new File(path + "/app.iml")
+    // 创建字符缓冲输入流!
+    BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(new FileInputStream(imlFile)))
+    // 在循环中读取iml文件，得到当前的Build Variants : SELECTED_BUILD_VARIANT
+    String tmpStr = ""
+    while ((tmpStr = bufferedReader.readLine()) != null) {
+        // 当前段有这个字段，我们成功的匹配到了当前的模式，我们需要继续匹配是否有debug字段
+        if (tmpStr.contains("SELECTED_BUILD_VARIANT") && !tmpStr.contains("debug")) {
+            if (System.console() == null) {
+                def tempKeyPassword = '';
+                def tempJksFile = '';
+                def tempAlias = '';
+                def tempStorePassword = '';
+                // 通过swing显示出一个密码框
+                new SwingBuilder().edt {
+                    dialog(modal: true, title: 'KeyStore info', alwaysOnTop: true, resizable: false, locationRelativeTo: null, size: [500, 200], show: true,) {
+                        vbox() { // Put everything below each other
+                            label(text: "alias(keystore):")
+                            // 获取输入的别名
+                            def input0 = textField()

-                    label(text: "path(keystore):")
-                    // 获取输入的文件地址
-                    def input1 = textField()
+                            label(text: "path(keystore):")
+                            // 获取输入的文件地址
+                            def input1 = textField()

-                    label(text: "pwd(KeyPassword):")
-                    // 获取输入的密码
-                    def input2 = passwordField()
+                            label(text: "pwd(KeyPassword):")
+                            // 获取输入的密码
+                            def input2 = passwordField()

-                    label(text: "pwd(StorePassword):")
-                    // 获取输入的密码
-                    def input3 = passwordField()
+                            label(text: "pwd(StorePassword):")
+                            // 获取输入的密码
+                            def input3 = passwordField()

-                    button(defaultButton: true, text: 'OK', actionPerformed: {
-                        tempAlias = input0.text;
-                        tempJksFile = input1.text;
-                        tempKeyPassword = new String(input2.password);
-                        tempStorePassword = new String(input3.password);
-                        dispose();
-                    })
+                            button(defaultButton: true, text: 'OK', actionPerformed: {
+                                tempAlias = input0.text;
+                                tempJksFile = input1.text;
+                                tempKeyPassword = new String(input2.password);
+                                tempStorePassword = new String(input3.password);
+                                dispose();
+                            })
+                        }
+                    }
+                }
+                // 输入别名
+                if (tempAlias.size() <= 0) {
+                    //没有获取到输入的文件，抛出异常
+                    throw new InvalidUserDataException("You must enter the ketstore alias to proceed.")
+                } else {
+                    System.setProperty("KEYALIAS_GLOBAL", new String(tempAlias))
+                }
+                // 输入文件地址!
+                if (tempJksFile.size() <= 0) {
+                    //没有获取到输入的文件，抛出异常
+                    throw new InvalidUserDataException("You must enter the keystore file to proceed.")
+                } else {
+                    System.setProperty("KEYSTORE_GLOBAL", new String(tempJksFile))
+                }
+                // 输入密码
+                if (tempKeyPassword.size() <= 0) {
+                    //没有获取到输入的密码，抛出异常
+                    throw new InvalidUserDataException("You must enter the key password to proceed.")
+                } else {
+                    System.setProperty("PASSWORD_GLOBAL", new String(tempKeyPassword))
+                }
+                // 输入密码
+                if (tempStorePassword.size() <= 0) {
+                    //没有获取到输入的密码，抛出异常
+                    throw new InvalidUserDataException("You must enter the store password to proceed.")
+                } else {
+                    System.setProperty("STOREKEY_GLOBAK", new String(tempStorePassword))
                }
            }
-        }
-        // 输入别名
-        if (tempAlias.size() <= 0) {
-            //没有获取到输入的文件，抛出异常
-            throw new InvalidUserDataException("You must enter the ketstore alias to proceed.")
-        } else {
-            System.setProperty("KEYALIAS_GLOBAL", new String(tempAlias))
-        }
-        // 输入文件地址!
-        if (tempJksFile.size() <= 0) {
-            //没有获取到输入的文件，抛出异常
-            throw new InvalidUserDataException("You must enter the keystore file to proceed.")
-        } else {
-            System.setProperty("KEYSTORE_GLOBAL", new String(tempJksFile))
-        }
-        // 输入密码
-        if (tempKeyPassword.size() <= 0) {
-            //没有获取到输入的密码，抛出异常
-            throw new InvalidUserDataException("You must enter the key password to proceed.")
-        } else {
-            System.setProperty("PASSWORD_GLOBAL", new String(tempKeyPassword))
-        }
-        // 输入密码
-        if (tempStorePassword.size() <= 0) {
-            //没有获取到输入的密码，抛出异常
-            throw new InvalidUserDataException("You must enter the store password to proceed.")
-        } else {
-            System.setProperty("STOREKEY_GLOBAK", new String(tempStorePassword))
+            bufferedReader.close()
+            return
        }
    }
+    bufferedReader.close()
 }

 // 这里主要是插入一个任务，用于在gradle assembleRelease任务之前
 // 调用我们的动态密码任务
-tasks.whenTaskAdded { theTask ->
-    if (theTask.name.equals("packageRelease")) {
+tasks.whenTaskAdded { Task theTask ->
+    println("当前的任务: " + theTask.name)
+    if (theTask.name.equals("assembleRelease")) {
        theTask.dependsOn getReleasePassword
+        theTask.mustRunAfter(getReleasePassword)
    }
 }
@@ -3,14 +3,6 @@
    "level": "INFO",
    "message": "Start JSON generation. Platform version: 18 min SDK version: arm64-v8a"
  },
-  {
-    "level": "INFO",
-    "message": "Trying to locate CMake in local SDK repository."
-  },
-  {
-    "level": "INFO",
-    "message": "- CMake found in SDK at \u0027C:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\u0027 had version \u00273.10.2\u0027"
-  },
  {
    "level": "INFO",
    "message": "JSON \u0027D:\\Developer\\AndroidStudioProject\\RFID-Tools\\crapto1\\.cxx\\cmake\\debug\\arm64-v8a\\android_gradle_build.json\u0027 was up-to-date"
@@ -3,6 +3,14 @@
    "level": "INFO",
    "message": "Start JSON generation. Platform version: 18 min SDK version: armeabi-v7a"
  },
+  {
+    "level": "INFO",
+    "message": "Trying to locate CMake in local SDK repository."
+  },
+  {
+    "level": "INFO",
+    "message": "- CMake found in SDK at \u0027C:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\u0027 had version \u00273.10.2\u0027"
+  },
  {
    "level": "INFO",
    "message": "JSON \u0027D:\\Developer\\AndroidStudioProject\\RFID-Tools\\crapto1\\.cxx\\cmake\\debug\\armeabi-v7a\\android_gradle_build.json\u0027 was up-to-date"
@@ -5,7 +5,43 @@
  },
  {
    "level": "INFO",
-    "message": "JSON \u0027D:\\Developer\\AndroidStudioProject\\RFID-Tools\\crapto1\\.cxx\\cmake\\debug\\x86\\android_gradle_build.json\u0027 was up-to-date"
+    "message": "Trying to locate CMake in local SDK repository."
+  },
+  {
+    "level": "INFO",
+    "message": "- CMake found in SDK at \u0027C:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\u0027 had version \u00273.10.2\u0027"
+  },
+  {
+    "level": "INFO",
+    "message": "rebuilding JSON D:\\Developer\\AndroidStudioProject\\RFID-Tools\\crapto1\\.cxx\\cmake\\debug\\x86\\android_gradle_build.json due to:"
+  },
+  {
+    "level": "INFO",
+    "message": "- force flag, will remove stale json folder"
+  },
+  {
+    "level": "INFO",
+    "message": "removing stale contents from \u0027D:\\Developer\\AndroidStudioProject\\RFID-Tools\\crapto1\\.cxx\\cmake\\debug\\x86\u0027"
+  },
+  {
+    "level": "INFO",
+    "message": "created folder \u0027D:\\Developer\\AndroidStudioProject\\RFID-Tools\\crapto1\\.cxx\\cmake\\debug\\x86\u0027"
+  },
+  {
+    "level": "INFO",
+    "message": "executing cmake Executable : C:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\\bin\\cmake.exe\narguments : \n-HD:\\Developer\\AndroidStudioProject\\RFID-Tools\\crapto1\\src\\main\\cpp\n-BD:\\Developer\\AndroidStudioProject\\RFID-Tools\\crapto1\\.cxx\\cmake\\debug\\x86\n-DANDROID_ABI\u003dx86\n-DANDROID_PLATFORM\u003dandroid-18\n-DCMAKE_LIBRARY_OUTPUT_DIRECTORY\u003dD:\\Developer\\AndroidStudioProject\\RFID-Tools\\crapto1\\build\\intermediates\\cmake\\debug\\obj\\x86\n-DCMAKE_BUILD_TYPE\u003dDebug\n-DANDROID_NDK\u003dC:\\Users\\DXL\\android-sdk\\ndk-bundle\n-DCMAKE_SYSTEM_NAME\u003dAndroid\n-DCMAKE_ANDROID_ARCH_ABI\u003dx86\n-DCMAKE_SYSTEM_VERSION\u003d18\n-DCMAKE_EXPORT_COMPILE_COMMANDS\u003dON\n-DCMAKE_ANDROID_NDK\u003dC:\\Users\\DXL\\android-sdk\\ndk-bundle\n-DCMAKE_TOOLCHAIN_FILE\u003dC:\\Users\\DXL\\android-sdk\\ndk-bundle\\build\\cmake\\android.toolchain.cmake\n-G Ninja\n-DCMAKE_MAKE_PROGRAM\u003dC:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\\bin\\ninja.exe\n-DANDROID_STL\u003dc++_static\njvmArgs : \n\n"
+  },
+  {
+    "level": "INFO",
+    "message": "done executing cmake"
+  },
+  {
+    "level": "INFO",
+    "message": "write build output D:\\Developer\\AndroidStudioProject\\RFID-Tools\\crapto1\\.cxx\\cmake\\debug\\x86\\build_output.txt"
+  },
+  {
+    "level": "INFO",
+    "message": "write command file D:\\Developer\\AndroidStudioProject\\RFID-Tools\\crapto1\\.cxx\\cmake\\debug\\x86\\build_command.txt"
  },
  {
    "level": "INFO",
@@ -5,7 +5,43 @@
  },
  {
    "level": "INFO",
-    "message": "JSON \u0027D:\\Developer\\AndroidStudioProject\\RFID-Tools\\freo\\.cxx\\cmake\\debug\\x86\\android_gradle_build.json\u0027 was up-to-date"
+    "message": "Trying to locate CMake in local SDK repository."
+  },
+  {
+    "level": "INFO",
+    "message": "- CMake found in SDK at \u0027C:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\u0027 had version \u00273.10.2\u0027"
+  },
+  {
+    "level": "INFO",
+    "message": "rebuilding JSON D:\\Developer\\AndroidStudioProject\\RFID-Tools\\freo\\.cxx\\cmake\\debug\\x86\\android_gradle_build.json due to:"
+  },
+  {
+    "level": "INFO",
+    "message": "- force flag, will remove stale json folder"
+  },
+  {
+    "level": "INFO",
+    "message": "removing stale contents from \u0027D:\\Developer\\AndroidStudioProject\\RFID-Tools\\freo\\.cxx\\cmake\\debug\\x86\u0027"
+  },
+  {
+    "level": "INFO",
+    "message": "created folder \u0027D:\\Developer\\AndroidStudioProject\\RFID-Tools\\freo\\.cxx\\cmake\\debug\\x86\u0027"
+  },
+  {
+    "level": "INFO",
+    "message": "executing cmake Executable : C:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\\bin\\cmake.exe\narguments : \n-HD:\\Developer\\AndroidStudioProject\\RFID-Tools\\freo\\src\\main\\cpp\n-BD:\\Developer\\AndroidStudioProject\\RFID-Tools\\freo\\.cxx\\cmake\\debug\\x86\n-DANDROID_ABI\u003dx86\n-DANDROID_PLATFORM\u003dandroid-18\n-DCMAKE_LIBRARY_OUTPUT_DIRECTORY\u003dD:\\Developer\\AndroidStudioProject\\RFID-Tools\\freo\\build\\intermediates\\cmake\\debug\\obj\\x86\n-DCMAKE_BUILD_TYPE\u003dDebug\n-DANDROID_NDK\u003dC:\\Users\\DXL\\android-sdk\\ndk-bundle\n-DCMAKE_SYSTEM_NAME\u003dAndroid\n-DCMAKE_ANDROID_ARCH_ABI\u003dx86\n-DCMAKE_SYSTEM_VERSION\u003d18\n-DCMAKE_EXPORT_COMPILE_COMMANDS\u003dON\n-DCMAKE_ANDROID_NDK\u003dC:\\Users\\DXL\\android-sdk\\ndk-bundle\n-DCMAKE_TOOLCHAIN_FILE\u003dC:\\Users\\DXL\\android-sdk\\ndk-bundle\\build\\cmake\\android.toolchain.cmake\n-G Ninja\n-DCMAKE_MAKE_PROGRAM\u003dC:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\\bin\\ninja.exe\n-DANDROID_STL\u003dc++_static\njvmArgs : \n\n"
+  },
+  {
+    "level": "INFO",
+    "message": "done executing cmake"
+  },
+  {
+    "level": "INFO",
+    "message": "write build output D:\\Developer\\AndroidStudioProject\\RFID-Tools\\freo\\.cxx\\cmake\\debug\\x86\\build_output.txt"
+  },
+  {
+    "level": "INFO",
+    "message": "write command file D:\\Developer\\AndroidStudioProject\\RFID-Tools\\freo\\.cxx\\cmake\\debug\\x86\\build_command.txt"
  },
  {
    "level": "INFO",
@@ -5,7 +5,43 @@
  },
  {
    "level": "INFO",
-    "message": "JSON \u0027D:\\Developer\\AndroidStudioProject\\RFID-Tools\\mfkey\\.cxx\\cmake\\debug\\x86\\android_gradle_build.json\u0027 was up-to-date"
+    "message": "Trying to locate CMake in local SDK repository."
+  },
+  {
+    "level": "INFO",
+    "message": "- CMake found in SDK at \u0027C:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\u0027 had version \u00273.10.2\u0027"
+  },
+  {
+    "level": "INFO",
+    "message": "rebuilding JSON D:\\Developer\\AndroidStudioProject\\RFID-Tools\\mfkey\\.cxx\\cmake\\debug\\x86\\android_gradle_build.json due to:"
+  },
+  {
+    "level": "INFO",
+    "message": "- force flag, will remove stale json folder"
+  },
+  {
+    "level": "INFO",
+    "message": "removing stale contents from \u0027D:\\Developer\\AndroidStudioProject\\RFID-Tools\\mfkey\\.cxx\\cmake\\debug\\x86\u0027"
+  },
+  {
+    "level": "INFO",
+    "message": "created folder \u0027D:\\Developer\\AndroidStudioProject\\RFID-Tools\\mfkey\\.cxx\\cmake\\debug\\x86\u0027"
+  },
+  {
+    "level": "INFO",
+    "message": "executing cmake Executable : C:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\\bin\\cmake.exe\narguments : \n-HD:\\Developer\\AndroidStudioProject\\RFID-Tools\\mfkey\\src\\main\\cpp\n-BD:\\Developer\\AndroidStudioProject\\RFID-Tools\\mfkey\\.cxx\\cmake\\debug\\x86\n-DANDROID_ABI\u003dx86\n-DANDROID_PLATFORM\u003dandroid-18\n-DCMAKE_LIBRARY_OUTPUT_DIRECTORY\u003dD:\\Developer\\AndroidStudioProject\\RFID-Tools\\mfkey\\build\\intermediates\\cmake\\debug\\obj\\x86\n-DCMAKE_BUILD_TYPE\u003dDebug\n-DANDROID_NDK\u003dC:\\Users\\DXL\\android-sdk\\ndk-bundle\n-DCMAKE_SYSTEM_NAME\u003dAndroid\n-DCMAKE_ANDROID_ARCH_ABI\u003dx86\n-DCMAKE_SYSTEM_VERSION\u003d18\n-DCMAKE_EXPORT_COMPILE_COMMANDS\u003dON\n-DCMAKE_ANDROID_NDK\u003dC:\\Users\\DXL\\android-sdk\\ndk-bundle\n-DCMAKE_TOOLCHAIN_FILE\u003dC:\\Users\\DXL\\android-sdk\\ndk-bundle\\build\\cmake\\android.toolchain.cmake\n-G Ninja\n-DCMAKE_MAKE_PROGRAM\u003dC:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\\bin\\ninja.exe\n-DANDROID_STL\u003dc++_static\njvmArgs : \n\n"
+  },
+  {
+    "level": "INFO",
+    "message": "done executing cmake"
+  },
+  {
+    "level": "INFO",
+    "message": "write build output D:\\Developer\\AndroidStudioProject\\RFID-Tools\\mfkey\\.cxx\\cmake\\debug\\x86\\build_output.txt"
+  },
+  {
+    "level": "INFO",
+    "message": "write command file D:\\Developer\\AndroidStudioProject\\RFID-Tools\\mfkey\\.cxx\\cmake\\debug\\x86\\build_command.txt"
  },
  {
    "level": "INFO",
@@ -3,14 +3,6 @@
    "level": "INFO",
    "message": "Start JSON generation. Platform version: 18 min SDK version: arm64-v8a"
  },
-  {
-    "level": "INFO",
-    "message": "Trying to locate CMake in local SDK repository."
-  },
-  {
-    "level": "INFO",
-    "message": "- CMake found in SDK at \u0027C:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\u0027 had version \u00273.10.2\u0027"
-  },
  {
    "level": "INFO",
    "message": "JSON \u0027D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3iceman\\.cxx\\cmake\\debug\\arm64-v8a\\android_gradle_build.json\u0027 was up-to-date"
@@ -3,6 +3,14 @@
    "level": "INFO",
    "message": "Start JSON generation. Platform version: 18 min SDK version: armeabi-v7a"
  },
+  {
+    "level": "INFO",
+    "message": "Trying to locate CMake in local SDK repository."
+  },
+  {
+    "level": "INFO",
+    "message": "- CMake found in SDK at \u0027C:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\u0027 had version \u00273.10.2\u0027"
+  },
  {
    "level": "INFO",
    "message": "JSON \u0027D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3iceman\\.cxx\\cmake\\debug\\armeabi-v7a\\android_gradle_build.json\u0027 was up-to-date"
@@ -5,7 +5,43 @@
  },
  {
    "level": "INFO",
-    "message": "JSON \u0027D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3iceman\\.cxx\\cmake\\debug\\x86\\android_gradle_build.json\u0027 was up-to-date"
+    "message": "Trying to locate CMake in local SDK repository."
+  },
+  {
+    "level": "INFO",
+    "message": "- CMake found in SDK at \u0027C:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\u0027 had version \u00273.10.2\u0027"
+  },
+  {
+    "level": "INFO",
+    "message": "rebuilding JSON D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3iceman\\.cxx\\cmake\\debug\\x86\\android_gradle_build.json due to:"
+  },
+  {
+    "level": "INFO",
+    "message": "- force flag, will remove stale json folder"
+  },
+  {
+    "level": "INFO",
+    "message": "removing stale contents from \u0027D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3iceman\\.cxx\\cmake\\debug\\x86\u0027"
+  },
+  {
+    "level": "INFO",
+    "message": "created folder \u0027D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3iceman\\.cxx\\cmake\\debug\\x86\u0027"
+  },
+  {
+    "level": "INFO",
+    "message": "executing cmake Executable : C:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\\bin\\cmake.exe\narguments : \n-HD:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3iceman\\src\\main\\cpp\n-BD:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3iceman\\.cxx\\cmake\\debug\\x86\n-DANDROID_ABI\u003dx86\n-DANDROID_PLATFORM\u003dandroid-18\n-DCMAKE_LIBRARY_OUTPUT_DIRECTORY\u003dD:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3iceman\\build\\intermediates\\cmake\\debug\\obj\\x86\n-DCMAKE_BUILD_TYPE\u003dDebug\n-DANDROID_NDK\u003dC:\\Users\\DXL\\android-sdk\\ndk-bundle\n-DCMAKE_SYSTEM_NAME\u003dAndroid\n-DCMAKE_ANDROID_ARCH_ABI\u003dx86\n-DCMAKE_SYSTEM_VERSION\u003d18\n-DCMAKE_EXPORT_COMPILE_COMMANDS\u003dON\n-DCMAKE_ANDROID_NDK\u003dC:\\Users\\DXL\\android-sdk\\ndk-bundle\n-DCMAKE_TOOLCHAIN_FILE\u003dC:\\Users\\DXL\\android-sdk\\ndk-bundle\\build\\cmake\\android.toolchain.cmake\n-G Ninja\n-DCMAKE_MAKE_PROGRAM\u003dC:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\\bin\\ninja.exe\n-DANDROID_STL\u003dc++_static\n-DPROJECTDIR\u003dD:/Developer/AndroidStudioProject/RFID-Tools\njvmArgs : \n\n"
+  },
+  {
+    "level": "INFO",
+    "message": "done executing cmake"
+  },
+  {
+    "level": "INFO",
+    "message": "write build output D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3iceman\\.cxx\\cmake\\debug\\x86\\build_output.txt"
+  },
+  {
+    "level": "INFO",
+    "message": "write command file D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3iceman\\.cxx\\cmake\\debug\\x86\\build_command.txt"
  },
  {
    "level": "INFO",
@@ -1,60 +1,2 @@
 ninja: Entering directory `D:\Developer\AndroidStudioProject\RFID-Tools\pm3iceman\.cxx\cmake\debug\x86_64'
-[1/59] Building C object CMakeFiles/pm3iceman.dir/common/iso15693tools.c.o
-[2/59] Building C object CMakeFiles/pm3iceman.dir/common/protocols.c.o
-[3/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdhf.c.o
-[4/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdtrace.c.o
-[5/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdhf14b.c.o
-[6/59] Building C object CMakeFiles/pm3iceman.dir/common/lfdemod.c.o
-[7/59] Building C object CMakeFiles/pm3iceman.dir/client/emv/cmdemv.c.o
-[8/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdhf14a.c.o
-[9/59] Building C object CMakeFiles/pm3iceman.dir/client/emv/emv_pk.c.o
-[10/59] Building C object CMakeFiles/pm3iceman.dir/client/emv/emvcore.c.o
-[11/59] Building C object CMakeFiles/pm3iceman.dir/client/graph.c.o
-[12/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdcrc.c.o
-[13/59] Building C object CMakeFiles/pm3iceman.dir/client/mifarehost.c.o
-[14/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdanalyse.c.o
-[15/59] Building C object CMakeFiles/pm3iceman.dir/client/cmddata.c.o
-[16/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdhfmf.c.o
-[17/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdhflegic.c.o
-[18/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdhf15.c.o
-[19/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdhflist.c.o
-[20/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdhfepa.c.o
-[21/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdhffelica.c.o
-[22/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdhficlass.c.o
-[23/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdhfmfdes.c.o
-[24/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlfhid.c.o
-[25/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlf.c.o
-[26/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlffdx.c.o
-[27/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdhftopaz.c.o
-[28/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlfio.c.o
-[29/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlfem4x.c.o
-[30/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdhfmfu.c.o
-[31/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdhw.c.o
-[32/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlfawid.c.o
-[33/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlfpyramid.c.o
-[34/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlfsecurakey.c.o
-[35/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlfparadox.c.o
-[36/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlfcotag.c.o
-[37/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlfviking.c.o
-[38/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlfindala.c.o
-[39/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlfti.c.o
-[40/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlfhitag.c.o
-[41/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlfnoralsy.c.o
-[42/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlfpac.c.o
-[43/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlfguard.c.o
-[44/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlfjablotron.c.o
-[45/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdparser.c.o
-[46/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlfnexwatch.c.o
-[47/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlfvisa2000.c.o
-[48/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlfpresco.c.o
-[49/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlfnedap.c.o
-[50/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdmain.c.o
-[51/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlfpcf7931.c.o
-[52/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdscript.c.o
-[53/59] Building C object CMakeFiles/pm3iceman.dir/client/scripting.c.o
-[54/59] Building C object CMakeFiles/pm3iceman.dir/client/proxmark3.c.o
-[55/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdlft55xx.c.o
-[56/59] Building C object CMakeFiles/pm3iceman.dir/client/hardnested/hardnested_bruteforce.c.o
-[57/59] Building C object CMakeFiles/pm3iceman.dir/uart/uart_posix.c.o
-[58/59] Building C object CMakeFiles/pm3iceman.dir/client/cmdhfmfhard.c.o
-[59/59] Linking C shared library D:\Developer\AndroidStudioProject\RFID-Tools\pm3iceman\build\intermediates\cmake\debug\obj\x86_64\libpm3iceman.so
+ninja: no work to do.
@@ -5,7 +5,43 @@
  },
  {
    "level": "INFO",
-    "message": "JSON \u0027D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3official\\.cxx\\cmake\\debug\\x86\\android_gradle_build.json\u0027 was up-to-date"
+    "message": "Trying to locate CMake in local SDK repository."
+  },
+  {
+    "level": "INFO",
+    "message": "- CMake found in SDK at \u0027C:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\u0027 had version \u00273.10.2\u0027"
+  },
+  {
+    "level": "INFO",
+    "message": "rebuilding JSON D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3official\\.cxx\\cmake\\debug\\x86\\android_gradle_build.json due to:"
+  },
+  {
+    "level": "INFO",
+    "message": "- force flag, will remove stale json folder"
+  },
+  {
+    "level": "INFO",
+    "message": "removing stale contents from \u0027D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3official\\.cxx\\cmake\\debug\\x86\u0027"
+  },
+  {
+    "level": "INFO",
+    "message": "created folder \u0027D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3official\\.cxx\\cmake\\debug\\x86\u0027"
+  },
+  {
+    "level": "INFO",
+    "message": "executing cmake Executable : C:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\\bin\\cmake.exe\narguments : \n-HD:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3official\\src\\main\\cpp\n-BD:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3official\\.cxx\\cmake\\debug\\x86\n-DANDROID_ABI\u003dx86\n-DANDROID_PLATFORM\u003dandroid-18\n-DCMAKE_LIBRARY_OUTPUT_DIRECTORY\u003dD:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3official\\build\\intermediates\\cmake\\debug\\obj\\x86\n-DCMAKE_BUILD_TYPE\u003dDebug\n-DANDROID_NDK\u003dC:\\Users\\DXL\\android-sdk\\ndk-bundle\n-DCMAKE_SYSTEM_NAME\u003dAndroid\n-DCMAKE_ANDROID_ARCH_ABI\u003dx86\n-DCMAKE_SYSTEM_VERSION\u003d18\n-DCMAKE_EXPORT_COMPILE_COMMANDS\u003dON\n-DCMAKE_ANDROID_NDK\u003dC:\\Users\\DXL\\android-sdk\\ndk-bundle\n-DCMAKE_TOOLCHAIN_FILE\u003dC:\\Users\\DXL\\android-sdk\\ndk-bundle\\build\\cmake\\android.toolchain.cmake\n-G Ninja\n-DCMAKE_MAKE_PROGRAM\u003dC:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\\bin\\ninja.exe\n-DANDROID_STL\u003dc++_static\n-DPROJECTDIR\u003dD:/Developer/AndroidStudioProject/RFID-Tools\njvmArgs : \n\n"
+  },
+  {
+    "level": "INFO",
+    "message": "done executing cmake"
+  },
+  {
+    "level": "INFO",
+    "message": "write build output D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3official\\.cxx\\cmake\\debug\\x86\\build_output.txt"
+  },
+  {
+    "level": "INFO",
+    "message": "write command file D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3official\\.cxx\\cmake\\debug\\x86\\build_command.txt"
  },
  {
    "level": "INFO",
@@ -1,55 +1,2 @@
 ninja: Entering directory `D:\Developer\AndroidStudioProject\RFID-Tools\pm3official\.cxx\cmake\debug\x86_64'
-[1/54] Building C object CMakeFiles/pm3.dir/common/iso15693tools.c.o
-[2/54] Building C object CMakeFiles/pm3.dir/client/emv/emvjson.c.o
-[3/54] Building C object CMakeFiles/pm3.dir/uart/uart_posix.c.o
-[4/54] Building C object CMakeFiles/pm3.dir/client/emv/emv_pk.c.o
-[5/54] Building C object CMakeFiles/pm3.dir/client/crypto/asn1dump.c.o
-[6/54] Building C object CMakeFiles/pm3.dir/client/emv/cmdemv.c.o
-[7/54] Building C object CMakeFiles/pm3.dir/client/cmdhf14b.c.o
-[8/54] Building C object CMakeFiles/pm3.dir/client/mifarehost.c.o
-[9/54] Building C object CMakeFiles/pm3.dir/client/cmdhf.c.o
-[10/54] Building C object CMakeFiles/pm3.dir/client/cmdhf14a.c.o
-[11/54] Building C object CMakeFiles/pm3.dir/client/cmddata.c.o
-[12/54] Building C object CMakeFiles/pm3.dir/client/comms.c.o
-[13/54] Building C object CMakeFiles/pm3.dir/client/cmdlfjablotron.c.o
-[14/54] Building C object CMakeFiles/pm3.dir/client/cmdhflist.c.o
-[15/54] Building C object CMakeFiles/pm3.dir/client/cmdhf15.c.o
-[16/54] Building C object CMakeFiles/pm3.dir/client/cmdhfmfu.c.o
-[17/54] Building C object CMakeFiles/pm3.dir/client/cmdhflegic.c.o
-[18/54] Building C object CMakeFiles/pm3.dir/client/cmdhfepa.c.o
-[19/54] Building C object CMakeFiles/pm3.dir/client/cmdhfmf.c.o
-[20/54] Building C object CMakeFiles/pm3.dir/client/cmdhw.c.o
-[21/54] Building C object CMakeFiles/pm3.dir/client/cmdhfmfp.c.o
-[22/54] Building C object CMakeFiles/pm3.dir/client/cmdhffido.c.o
-[23/54] Building C object CMakeFiles/pm3.dir/client/cmdhficlass.c.o
-[24/54] Building C object CMakeFiles/pm3.dir/client/cmdlfhid.c.o
-[25/54] Building C object CMakeFiles/pm3.dir/client/cmdlf.c.o
-[26/54] Building C object CMakeFiles/pm3.dir/client/cmdhftopaz.c.o
-[27/54] Building C object CMakeFiles/pm3.dir/client/cmdlffdx.c.o
-[28/54] Building C object CMakeFiles/pm3.dir/client/cmdlfem4x.c.o
-[29/54] Building C object CMakeFiles/pm3.dir/client/cmdlfio.c.o
-[30/54] Building C object CMakeFiles/pm3.dir/client/cmdlfhitag.c.o
-[31/54] Building C object CMakeFiles/pm3.dir/client/cmdlfti.c.o
-[32/54] Building C object CMakeFiles/pm3.dir/client/cmdlfpcf7931.c.o
-[33/54] Building C object CMakeFiles/pm3.dir/client/cmdlft55xx.c.o
-[34/54] Building C object CMakeFiles/pm3.dir/client/cmdlfpac.c.o
-[35/54] Building C object CMakeFiles/pm3.dir/client/cmdlfindala.c.o
-[36/54] Building C object CMakeFiles/pm3.dir/client/cmdlfnexwatch.c.o
-[37/54] Building C object CMakeFiles/pm3.dir/client/cmdlfviking.c.o
-[38/54] Building C object CMakeFiles/pm3.dir/client/cmdlfnoralsy.c.o
-[39/54] Building C object CMakeFiles/pm3.dir/client/cmdlfpresco.c.o
-[40/54] Building C object CMakeFiles/pm3.dir/client/cmdparser.c.o
-[41/54] Building C object CMakeFiles/pm3.dir/client/cmdlfsecurakey.c.o
-[42/54] Building C object CMakeFiles/pm3.dir/client/cmdlfpyramid.c.o
-[43/54] Building C object CMakeFiles/pm3.dir/client/cmdlfparadox.c.o
-[44/54] Building C object CMakeFiles/pm3.dir/client/cmdlfawid.c.o
-[45/54] Building C object CMakeFiles/pm3.dir/client/cmdlfcotag.c.o
-[46/54] Building C object CMakeFiles/pm3.dir/client/cmdmain.c.o
-[47/54] Building C object CMakeFiles/pm3.dir/client/cmdlfgproxii.c.o
-[48/54] Building C object CMakeFiles/pm3.dir/client/cmdscript.c.o
-[49/54] Building C object CMakeFiles/pm3.dir/client/scripting.c.o
-[50/54] Building C object CMakeFiles/pm3.dir/client/proxmark3.c.o
-[51/54] Building C object CMakeFiles/pm3.dir/client/cmdlfvisa2000.c.o
-[52/54] Building C object CMakeFiles/pm3.dir/client/hardnested/hardnested_bruteforce.c.o
-[53/54] Building C object CMakeFiles/pm3.dir/client/cmdhfmfhard.c.o
-[54/54] Linking C shared library D:\Developer\AndroidStudioProject\RFID-Tools\pm3official\build\intermediates\cmake\debug\obj\x86_64\libpm3.so
+ninja: no work to do.
@@ -5,7 +5,43 @@
  },
  {
    "level": "INFO",
-    "message": "JSON \u0027D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3rdv4rrg\\.cxx\\cmake\\debug\\x86\\android_gradle_build.json\u0027 was up-to-date"
+    "message": "Trying to locate CMake in local SDK repository."
+  },
+  {
+    "level": "INFO",
+    "message": "- CMake found in SDK at \u0027C:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\u0027 had version \u00273.10.2\u0027"
+  },
+  {
+    "level": "INFO",
+    "message": "rebuilding JSON D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3rdv4rrg\\.cxx\\cmake\\debug\\x86\\android_gradle_build.json due to:"
+  },
+  {
+    "level": "INFO",
+    "message": "- force flag, will remove stale json folder"
+  },
+  {
+    "level": "INFO",
+    "message": "removing stale contents from \u0027D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3rdv4rrg\\.cxx\\cmake\\debug\\x86\u0027"
+  },
+  {
+    "level": "INFO",
+    "message": "created folder \u0027D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3rdv4rrg\\.cxx\\cmake\\debug\\x86\u0027"
+  },
+  {
+    "level": "INFO",
+    "message": "executing cmake Executable : C:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\\bin\\cmake.exe\narguments : \n-HD:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3rdv4rrg\\src\\main\\cpp\n-BD:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3rdv4rrg\\.cxx\\cmake\\debug\\x86\n-DANDROID_ABI\u003dx86\n-DANDROID_PLATFORM\u003dandroid-18\n-DCMAKE_LIBRARY_OUTPUT_DIRECTORY\u003dD:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3rdv4rrg\\build\\intermediates\\cmake\\debug\\obj\\x86\n-DCMAKE_BUILD_TYPE\u003dDebug\n-DANDROID_NDK\u003dC:\\Users\\DXL\\android-sdk\\ndk-bundle\n-DCMAKE_SYSTEM_NAME\u003dAndroid\n-DCMAKE_ANDROID_ARCH_ABI\u003dx86\n-DCMAKE_SYSTEM_VERSION\u003d18\n-DCMAKE_EXPORT_COMPILE_COMMANDS\u003dON\n-DCMAKE_ANDROID_NDK\u003dC:\\Users\\DXL\\android-sdk\\ndk-bundle\n-DCMAKE_TOOLCHAIN_FILE\u003dC:\\Users\\DXL\\android-sdk\\ndk-bundle\\build\\cmake\\android.toolchain.cmake\n-G Ninja\n-DCMAKE_MAKE_PROGRAM\u003dC:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\\bin\\ninja.exe\n-DANDROID_STL\u003dc++_static\n-DPROJECTDIR\u003dD:/Developer/AndroidStudioProject/RFID-Tools\njvmArgs : \n\n"
+  },
+  {
+    "level": "INFO",
+    "message": "done executing cmake"
+  },
+  {
+    "level": "INFO",
+    "message": "write build output D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3rdv4rrg\\.cxx\\cmake\\debug\\x86\\build_output.txt"
+  },
+  {
+    "level": "INFO",
+    "message": "write command file D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pm3rdv4rrg\\.cxx\\cmake\\debug\\x86\\build_command.txt"
  },
  {
    "level": "INFO",
@@ -1,66 +1,2 @@
 ninja: Entering directory `D:\Developer\AndroidStudioProject\RFID-Tools\pm3rdv4rrg\.cxx\cmake\debug\x86_64'
-[1/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/uart/uart_posix.c.o
-[2/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/common/crapto1/crapto1.c.o
-[3/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/loclass/fileutils.c.o
-[4/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/emv/cmdemv.c.o
-[5/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/common/lfdemod.c.o
-[6/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/emv/emvcore.c.o
-[7/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/mifare/mifare4.c.o
-[8/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdhf.c.o
-[9/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/mifare/mifarehost.c.o
-[10/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdhf14a.c.o
-[11/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdhflegic.c.o
-[12/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdhf15.c.o
-[13/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdhfepa.c.o
-[14/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdhf14b.c.o
-[15/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdtrace.c.o
-[16/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/comms.c.o
-[17/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdanalyse.c.o
-[18/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmddata.c.o
-[19/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdhflist.c.o
-[20/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdhfmfdes.c.o
-[21/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdflashmemspiffs.c.o
-[22/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdhfmf.c.o
-[23/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdhffelica.c.o
-[24/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdhfthinfilm.c.o
-[25/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdhficlass.c.o
-[26/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlf.c.o
-[27/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdhftopaz.c.o
-[28/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdhfmfp.c.o
-[29/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlfkeri.c.o
-[30/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdhfmfu.c.o
-[31/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlfjablotron.c.o
-[32/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdhw.c.o
-[33/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlfguard.c.o
-[34/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdhffido.c.o
-[35/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlfhid.c.o
-[36/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlfem4x.c.o
-[37/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlffdx.c.o
-[38/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlfio.c.o
-[39/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlfhitag.c.o
-[40/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlfnedap.c.o
-[41/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlfpac.c.o
-[42/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlfnoralsy.c.o
-[43/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlfpresco.c.o
-[44/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlfti.c.o
-[45/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlfindala.c.o
-[46/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdsmartcard.c.o
-[47/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlfnexwatch.c.o
-[48/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlfviking.c.o
-[49/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlfparadox.c.o
-[50/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlfsecurakey.c.o
-[51/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlfpyramid.c.o
-[52/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdscript.c.o
-[53/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdparser.c.o
-[54/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdmain.c.o
-[55/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlfvisa2000.c.o
-[56/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlfcotag.c.o
-[57/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlfawid.c.o
-[58/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlfpcf7931.c.o
-[59/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdflashmem.c.o
-[60/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/scripting.c.o
-[61/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/proxmark3.c.o
-[62/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdlft55xx.c.o
-[63/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdhfmfhard.c.o
-[64/65] Building C object CMakeFiles/pm3rrg_rdv4.dir/client/cmdusart.c.o
-[65/65] Linking C shared library D:\Developer\AndroidStudioProject\RFID-Tools\pm3rdv4rrg\build\intermediates\cmake\debug\obj\x86_64\libpm3rrg_rdv4.so
+ninja: no work to do.
@@ -62,22 +62,6 @@
      "headers": [],
      "output": "D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pn53x\\build\\intermediates\\cmake\\debug\\obj\\x86\\libemulate.so"
    },
-    "nfclist-Debug-x86": {
-      "buildCommand": "C:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\\bin\\ninja.exe -C \"D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pn53x\\.cxx\\cmake\\debug\\x86\" nfclist",
-      "buildType": "debug",
-      "toolchain": "2944678014",
-      "abi": "x86",
-      "artifactName": "nfclist",
-      "files": [
-        {
-          "src": "D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pn53x\\src\\main\\cpp\\nfclist\\nfclist.c",
-          "flagsOrdinal": 7,
-          "workingDirectoryOrdinal": 0
-        }
-      ],
-      "headers": [],
-      "output": "D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pn53x\\build\\intermediates\\cmake\\debug\\obj\\x86\\libnfclist.so"
-    },
    "hard-Debug-x86": {
      "buildCommand": "C:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\\bin\\ninja.exe -C \"D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pn53x\\.cxx\\cmake\\debug\\x86\" hard",
      "buildType": "debug",
@@ -119,6 +103,22 @@
      "headers": [],
      "output": "D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pn53x\\build\\intermediates\\cmake\\debug\\obj\\x86\\libhard.so"
    },
+    "nfclist-Debug-x86": {
+      "buildCommand": "C:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\\bin\\ninja.exe -C \"D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pn53x\\.cxx\\cmake\\debug\\x86\" nfclist",
+      "buildType": "debug",
+      "toolchain": "2944678014",
+      "abi": "x86",
+      "artifactName": "nfclist",
+      "files": [
+        {
+          "src": "D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pn53x\\src\\main\\cpp\\nfclist\\nfclist.c",
+          "flagsOrdinal": 7,
+          "workingDirectoryOrdinal": 0
+        }
+      ],
+      "headers": [],
+      "output": "D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pn53x\\build\\intermediates\\cmake\\debug\\obj\\x86\\libnfclist.so"
+    },
    "nfc-Debug-x86": {
      "buildCommand": "C:\\Users\\DXL\\android-sdk\\cmake\\3.10.2.4988404\\bin\\ninja.exe -C \"D:\\Developer\\AndroidStudioProject\\RFID-Tools\\pn53x\\.cxx\\cmake\\debug\\x86\" nfc",
      "buildType": "debug",
--- a/Show More
+++ b/Show More