Change the logic to check the native image with ildasm

Change-Id: Ie6bfcf378ea4bd3edd4708ea7f6bfd2fd5d8a104

diff --git a/NativeLauncher/tool/ni_common.cc b/NativeLauncher/tool/ni_common.cc
index 1cd885f..db1eab6 100644 (file)
--- a/NativeLauncher/tool/ni_common.cc
+++ b/NativeLauncher/tool/ni_common.cc
@@ -422,20 +422,15 @@ static bool isCoreLibPrepared(DWORD flags)
 
 static bool hasCoreLibNI()
 {
-       FILE *fp;
-       char buff[1024];
        std::string ildasm = concatPath(__pm->getRuntimePath(), "ildasm");
        std::string coreLib = concatPath(__pm->getRuntimePath(), "System.Private.CoreLib.dll");
-       std::string cmd = ildasm + " " + coreLib + " | grep '\\.corflags'";
+       std::string cmd = ildasm + " " + coreLib + " -noil -stats | grep '\\.xdata'";
+
+       FILE *fp;
        fp = popen(cmd.c_str(), "r");
        if (fp != NULL) {
-               while (fgets(buff, sizeof(buff), fp) != NULL) {
-                       buff[strlen(buff) - 1] = '\0';
-               }
-               std::string corflag = replaceAll(buff, ".corflags", "");
-               corflag.erase(std::remove(corflag.begin(), corflag.end(), ' '), corflag.end());
-               // CorFlags.ILLibrary=0x00000004 (.ni.dll)
-               if (!strcmp(corflag.substr(0, 10).c_str(), "0x00000004")) {
+               char buff[1024];
+               if (fgets(buff, sizeof(buff), fp) != NULL) {
                        pclose(fp);
                        return true;
                }