feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use /data/local/tmp instead of /data/local to deploy local libs

Browse Source 
Change-Id: Id55c1570222daf2bd04ae1cded4ab53f0cdfbca4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
BogDan Vatra
2013-01-06 16:22:23 +02:00
committed by Daniel Teske
parent 674ec5efa9
commit be2176f1de
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androiddeploystep.cpp
View File

@@ -252,7 +252,7 @@ bool AndroidDeployStep::deployPackage()
writeOutput(tr("Clean old Qt libraries"));
runCommand(deployProc, AndroidConfigurations::instance().adbToolPath().toString(),
QStringList() << QLatin1String("-s") << m_deviceSerialNumber
<< QLatin1String("shell") << QLatin1String("rm") << QLatin1String("-r") << QLatin1String("/data/local/qt"));
<< QLatin1String("shell") << QLatin1String("rm") << QLatin1String("-r") << QLatin1String("/data/local/tmp/qt"));
writeOutput(tr("Deploy Qt libraries. This may take some time, please wait."));
const QString tempPath = QDir::tempPath() + QLatin1String("/android_qt_libs_") + m_packageName;
@@ -269,7 +269,7 @@ bool AndroidDeployStep::deployPackage()
AndroidPackageCreationStep::stripAndroidLibs(stripFiles, target()->activeRunConfiguration()->abi().architecture());
runCommand(deployProc, AndroidConfigurations::instance().adbToolPath().toString(),
QStringList() << QLatin1String("-s") << m_deviceSerialNumber
<< QLatin1String("push") << tempPath << QLatin1String("/data/local/qt"));
<< QLatin1String("push") << tempPath << QLatin1String("/data/local/tmp/qt"));
AndroidPackageCreationStep::removeDirectory(tempPath);
emit (resetDelopyAction());
}

2
src/plugins/android/androidrunner.cpp
View File

@@ -196,7 +196,7 @@ void AndroidRunner::asyncStart()
if (m_useLocalQtLibs) {
extraParams += QLatin1String(" -e use_local_qt_libs true");
extraParams += QLatin1String(" -e libs_prefix /data/local/qt/");
extraParams += QLatin1String(" -e libs_prefix /data/local/tmp/qt/");
extraParams += QLatin1String(" -e load_local_libs ") + m_localLibs;
extraParams += QLatin1String(" -e load_local_jars ") + m_localJars;
if (!m_localJarsInitClasses.isEmpty())