diff --cc geckoprofiler.update.rdf index b9bdaa5,548d93c..0000000 --- a/geckoprofiler.update.rdf +++ b/geckoprofiler.update.rdf diff --cc geckoprofiler.xpi index d3f2809,1bcd47b..0000000 Binary files differ diff --git a/lib/main.js b/lib/main.js index 76cbf2f..e635d1e 100644 --- a/lib/main.js +++ b/lib/main.js @@ -502,7 +502,7 @@ function adb_get_process_info(finish_callback) { var startProfilingCmd; var restartCmd; var savePath; - if (pkgName.indexOf("/system/b2g/b2g") != -1) { + if (pkgName.indexOf("/system/b2g/b2g") != -1 || pkgName.indexOf("/system/b2g/plugin-container") != -1) { runAs = ""; startProfilingCmd = "adb shell kill -31 " + pid; stopCmd = "adb shell kill -12 " + pid; @@ -607,8 +607,8 @@ function adb_pull(progress_callback, finish_callback) { cmdRunnerModule.runCommand("/bin/bash -l -c 'rm tmp/symbol.apk'", function (r) {}); cmdRunnerModule.runCommand( "/bin/bash -l -c '" + - "adb pull " + processInfo.savePath + "/profile_0_" + processInfo.pid + ".txt /tmp/fennec_profile.txt || " + - "adb pull /sdcard/profile_0_" + processInfo.pid + ".txt /tmp/fennec_profile.txt;" + // For backwards compatibility + "adb pull " + processInfo.savePath + "/profile_2_" + processInfo.pid + ".txt /tmp/fennec_profile.txt || " + + "adb pull /sdcard/profile_2_" + processInfo.pid + ".txt /tmp/fennec_profile.txt;" + // For backwards compatibility "adb pull /data/app/" + processInfo.pkgName + "-1.apk /tmp/symbol.apk || adb pull /data/app/" + processInfo.pkgName + "-2.apk /tmp/symbol.apk; " + "unzip -o /tmp/symbol.apk -d \"" + fennecPathPrefix + "\"'; cp \"" + fennecPathPrefix + "\"/lib/armeabi-v7a/libmozglue.so \"" + fennecPathPrefix + "\"",