Fix SO entry is main executable detection on android

[tberghammer]

Summary

Fix SO entry is main executable detection on android

• On Android (at least on platfrom-21 x86) the dynamic linker reports the executable with its full path
• Use the platform path of the executable when storing it into the cache (used to identify the SO entry for the executable) as this is the path what will be reported by the dynamic linker. If the platform path isn't set (local debugging) then it falls back to the normal file path.

[clayborg]

Looks good.

[ovyalov]

source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp

298 ↗

(On Diff #21841)

return entry.path.empty(); ?

[tberghammer]

Fix bug spotted in review

source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp

298 ↗

(On Diff #21841)

Nice catch

[ovyalov]

LGTM

lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp

DYLDRendezvous::DYLDRendezvous(Process *process)
     m_thread_info.valid = false;
 
     // Cache a copy of the executable path
     if (m_process)
     {
         Module *exe_mod = m_process->GetTarget().GetExecutableModulePointer();
         if (exe_mod)
         {
-            exe_mod->GetFileSpec().GetPath(m_exe_path, PATH_MAX);
+            exe_mod->GetPlatformFileSpec().GetPath(m_exe_path, PATH_MAX);
             if (log)
                 log->Printf ("DYLDRendezvous::%s exe module executable path set: '%s'", __FUNCTION__, m_exe_path);
         }
         else
         {
             if (log)
                 log->Printf ("DYLDRendezvous::%s cannot cache exe module path: null executable module pointer", __FUNCTION__);
         }
DYLDRendezvous::UpdateSOEntriesForDeletion()
     m_soentries = entry_list;
     return true;
 }
 
 bool
 DYLDRendezvous::SOEntryIsMainExecutable(const SOEntry &entry)
 {
     // On Linux the executable is indicated by an empty path in the entry. On
-    // FreeBSD it is the full path to the executable. On Android, it is the
-    // basename of the executable.
+    // FreeBSD and on Android it is the full path to the executable.
 
     auto triple = m_process->GetTarget().GetArchitecture().GetTriple();
     auto os_type = triple.getOS();
     auto env_type = triple.getEnvironment();
 
     switch (os_type) {
         case llvm::Triple::FreeBSD:
             return ::strcmp(entry.path.c_str(), m_exe_path) == 0;
         case llvm::Triple::Linux:
-            return entry.path.empty() || (env_type == llvm::Triple::Android &&
-                   llvm::sys::path::filename(m_exe_path) == entry.path);
+            switch (env_type) {
+                case llvm::Triple::Android:
+                    return ::strcmp(entry.path.c_str(), m_exe_path) == 0;
+                default:
+                    return entry.path.empty();
+            }
         default:
             return false;
     }
 }
 
 bool
 DYLDRendezvous::TakeSnapshot(SOEntryList &entry_list)
 {