maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix Android-SDK detection on API 10 device 

Run the getprop command with AdbClient::Shell instead of
Platform::RunShellCommand because getting the output from getprop
with Platform::RunShellCommand have some (currently unknown) issues.

llvm-svn: 249014
This commit is contained in:
Tamas Berghammer 2015-10-01 13:58:01 +00:00
parent 76011b63cd
commit 3e8947be91
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp
View File

@ -283,23 +283,19 @@ PlatformAndroid::GetSdkVersion()
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())
AdbClient adb(m_device_id);
Error error = adb.Shell("getprop ro.build.version.sdk", 5000 /* ms */, &version_string);
version_string = llvm::StringRef(version_string).trim().str();
if (error.Fail() || 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());
log->Printf("Get SDK version failed. (error: %s, output: %s)",
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;