android: Update layer push to support 64-bit

The path we were using doesn't exist for arm64.  The new path
should work for all ABIs.
This commit is contained in:
Cody Northrop
2017-09-18 23:45:04 -06:00
committed by Baldur Karlsson
parent 83697f4e85
commit 96e93294fa
+9 -1
View File
@@ -968,8 +968,16 @@ extern "C" RENDERDOC_API bool RENDERDOC_CC RENDERDOC_PushLayerToInstalledAndroid
if(layerPath.empty())
return false;
string layerDst = "/data/data/" + packageName + "/lib/";
// Determine where to push the layer
string pkgPath = trim(adbExecCommand(deviceID, "shell pm path " + packageName).strStdout);
// Isolate the app's lib dir
pkgPath.erase(pkgPath.begin(), pkgPath.begin() + strlen("package:"));
string libDir = removeFromEnd(pkgPath, "base.apk") + "lib/";
// There will only be one ABI in the lib dir
string libsAbi = trim(adbExecCommand(deviceID, "shell ls " + libDir).strStdout);
string layerDst = libDir + libsAbi + "/";
result = adbExecCommand(deviceID, "push " + layerPath + " " + layerDst);
// Ensure the push succeeded