| commit | f8341ea0704df6b503eba8d90b24456d0ebd3c3e | |
| author | jam <jam@chromium.org> | |
| Mon, 13 Jul 2015 20:53:53 +0000 (13 13:53 -0700) | ||
| committer | Commit bot <commit-bot@chromium.org> | |
| Mon, 13 Jul 2015 20:54:34 +0000 (13 20:54 +0000) | ||
| tree | 43768a1df5b72b330ec768f49c25fa960fe07d5b | treesnapshot (tar.gz zip) |
| parent | 2f502000895562efe1f57e6fcdd70524f878ccb8 | commitdiff |
Fix apptests on Android.
The problem was that r338299 moved Context::Init call to run on the main thread on Android, just like it does on desktop, to avoid ApplicationManager being called on multiple threads (which leads to WeakPtr wrong-thread dchecks). This fixed Mandoline on Android, but caused problems with mojo_shell on Android. The reason was that ConfigureAndroidServices wasn't being called before Init.
The fix is to make mojo_shell on Android similar to Mandoline on Android, and mojo_shell and Mandoline on desktop, by having ApplicationManager only be accessed on the main thread. This fixes the weak ptr asserts and also shares more code paths.
BUG=497394
Review URL: https://codereview.chromium.org/1236743002
Cr-Commit-Position: refs/heads/master@{#338561}
The problem was that r338299 moved Context::Init call to run on the main thread on Android, just like it does on desktop, to avoid ApplicationManager being called on multiple threads (which leads to WeakPtr wrong-thread dchecks). This fixed Mandoline on Android, but caused problems with mojo_shell on Android. The reason was that ConfigureAndroidServices wasn't being called before Init.
The fix is to make mojo_shell on Android similar to Mandoline on Android, and mojo_shell and Mandoline on desktop, by having ApplicationManager only be accessed on the main thread. This fixes the weak ptr asserts and also shares more code paths.
BUG=497394
Review URL: https://codereview.chromium.org/1236743002
Cr-Commit-Position: refs/heads/master@{#338561}
| mojo/runner/android/main.cc | diffblobblamehistory | |
| mojo/runner/context.cc | diffblobblamehistory | |
| mojo/runner/context.h | diffblobblamehistory | |
| mojo/runner/desktop/launcher_process.cc | diffblobblamehistory |