Skip to content

Commit 972c1ac

Browse files
dellis1972jonpryor
authored andcommitted
[Xamarin.Android.Build.Tasks] Fix the name of the profiler so the runtime can load it (#20)
1 parent 3abbb54 commit 972c1ac

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,10 @@ public override bool Execute ()
215215
}
216216
debugServer = androidDebugServer.Value;
217217

218+
if (string.IsNullOrEmpty (AndroidEmbedProfilers) && _Debug) {
219+
AndroidEmbedProfilers = "log";
220+
}
221+
218222
var outputFiles = new List<string> ();
219223

220224
ExecuteWithAbi (SupportedAbis, ApkInputPath, ApkOutputPath);
@@ -422,7 +426,7 @@ void AddProfilers (ZipFile apk, string abi)
422426
foreach (var profiler in ParseProfilers (AndroidEmbedProfilers)) {
423427
var library = string.Format ("libmono-profiler-{1}.{0}.so", abi, profiler);
424428
var path = Path.Combine (root, "lib", abi, library);
425-
apk.AddEntry (string.Format ("lib/{0}/libmono-profiler.so", abi), File.OpenRead (path));
429+
apk.AddEntry (string.Format ("lib/{0}/libmono-profiler-{1}.so", abi, profiler), File.OpenRead (path));
426430
}
427431
}
428432
}

0 commit comments

Comments
 (0)