This is a follow up for bug 1259819 (see this comment: https://bugzilla.mozilla.org/show_bug.cgi?id=1259819#c12) Browser loader is using hardcoded list of directories (BROWSER_BASED_DIRS) that is used to identify modules that should be loaded in browser environment. Since appending new directories into this list doesn't feel right we could introduce a regular expression that would be used to match the right directories. Honza

Here is a try run: https://treeherder.mozilla.org/#/jobs?repo=try&revision=a3cd5ede0836 Honza

Comment on attachment 8763590 [details] [diff] [review] bug1280949.patch Needs more testing yet. Honza

New version, let's see what the Try says: https://treeherder.mozilla.org/#/jobs?repo=try&revision=4e68c4e99ca5 Honza

Comment on attachment 8763605 [details] [diff] [review] bug1280949.patch There is one orange, but seems unrelated. I think it's ready for review. Honza

Comment on attachment 8763605 [details] [diff] [review] bug1280949.patch Review of attachment 8763605 [details] [diff] [review]: ----------------------------------------------------------------- Looks good, I can't think of any place where this would be a problem.

Great, thanks! Honza

Pushed by cbook@mozilla.com: https://hg.mozilla.org/integration/fx-team/rev/085b95afe6e3 Use regexpr to identify browser based directories. r=jlongster