Fetch SDK version from PlatformAndroid

[tberghammer]

Summary

Fetch SDK version from PlatformAndroid

The SDK version implies the features supported by a given android
device. This version number will be used in future changes to execute
the right command on the device.

[ovyalov]

Please see my comments.

source/Plugins/Platform/Android/PlatformAndroid.cpp

284 ↗

(On Diff #31790)

Could you check for error that RunShellCommand returns?

290 ↗

(On Diff #31790)

StringConvert::ToUInt32 ?

[tberghammer]

Address review comments

[ovyalov]

Looks good.

source/Plugins/Platform/Android/PlatformAndroid.cpp

292 ↗

(On Diff #31822)

Please add logging in case of error.

lldb/trunk/source/Plugins/Platform/Android/PlatformAndroid.h

public:
         GetFile (const FileSpec& source,
                  const FileSpec& destination) override;
 
         Error
         PutFile (const FileSpec& source,
                  const FileSpec& destination,
                  uint32_t uid = UINT32_MAX,
                  uint32_t gid = UINT32_MAX) override;
         
+        uint32_t
+        GetSdkVersion();
+        
+        Error
+        DisconnectRemote () override;
+
      protected:
         const char *
         GetCacheHostname () override;
 
         Error
         DownloadModuleSlice (const FileSpec &src_file_spec,
                              const uint64_t src_offset,
                              const uint64_t src_size,
                              const FileSpec &dst_file_spec) override;
 
     private:
         std::string m_device_id;
+        uint32_t m_sdk_version;
+
         DISALLOW_COPY_AND_ASSIGN (PlatformAndroid);
     };
 
 } // namespace platofor_android
 } // namespace lldb_private
 
 #endif  // liblldb_PlatformAndroid_h_

lldb/trunk/source/Plugins/Platform/Android/PlatformAndroid.cpp

 //===-- PlatformAndroid.cpp -------------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 // C Includes
 // C++ Includes
 // Other libraries and framework includes
 #include "lldb/Core/Log.h"
 #include "lldb/Core/PluginManager.h"
 #include "lldb/Host/HostInfo.h"
+#include "lldb/Host/StringConvert.h"
 #include "Utility/UriParser.h"
 
 // Project includes
 #include "AdbClient.h"
 #include "PlatformAndroid.h"
 #include "PlatformAndroidRemoteGDBServer.h"
 
 using namespace lldb;
#endif
 
     if (log)
         log->Printf ("PlatformAndroid::%s() aborting creation of remote-android platform", __FUNCTION__);
 
     return PlatformSP();
 }
 
 PlatformAndroid::PlatformAndroid (bool is_host) :
-    PlatformLinux(is_host)
+    PlatformLinux(is_host),
+    m_sdk_version(0)
 {
 }
 
 PlatformAndroid::~PlatformAndroid()
 {
 }
 
 ConstString
PlatformAndroid::DownloadModuleSlice (const FileSpec &src_file_spec,
                                       const uint64_t src_size,
                                       const FileSpec &dst_file_spec)
 {
     if (src_offset != 0)
         return Error ("Invalid offset - %" PRIu64, src_offset);
 
     return GetFile (src_file_spec, dst_file_spec);
 }
+
+Error
+PlatformAndroid::DisconnectRemote()
+{
+    Error error = PlatformLinux::DisconnectRemote();
+    if (error.Success())
+    {
+        m_device_id.clear();
+        m_sdk_version = 0;
+    }
+    return error;
+}
+
+uint32_t
+PlatformAndroid::GetSdkVersion()
+{
+    if (!IsConnected())
+        return 0;
+
+    if (m_sdk_version != 0)
+        return m_sdk_version;
+
+    int status = 0;
+    std::string version_string;
+    Error error = RunShellCommand("getprop ro.build.version.sdk",
+                                  GetWorkingDirectory(),
+                                  &status,
+                                  nullptr,
+                                  &version_string,
+                                  1);
+    if (error.Fail() || status != 0 || version_string.empty())
+    {
+        Log* log = GetLogIfAllCategoriesSet(LIBLLDB_LOG_PLATFORM);
+        if (log)
+            log->Printf("Get SDK version failed. (status: %d, error: %s, output: %s)",
+                        status, error.AsCString(), version_string.c_str());
+        return 0;
+    }
+    version_string.erase(version_string.size() - 1); // Remove trailing new line
+
+    m_sdk_version = StringConvert::ToUInt32(version_string.c_str());
+    return m_sdk_version;
+}