961780 - Handle the conflict between Firefox and b2g "browser" package

Status: RESOLVED FIXED

(Firefox OS Graveyard :: General, defect)

Description

[Alexandre Poirot [:ochameau]]

When building a "mulet" (bug 943878), we have a conflict between Firefox and b2g package both called "browser" so that we either have shell.html working or browser.xul.

A possible way to address that could be to rename b2g package. But it may break some resources from b2g/chrome/content that are expected to override default browser ones (like net/cert errors)? It may also expose unexpected resources from browser package.

There might be other ways to address that by building the mulet differently (bug 961745)

Comment 1

[Alexandre Poirot [:ochameau]]

Attachment: Use "b2g" package name instead of "browser"

Here is a patch to rename the package to make a working mulet.

Comment 2

[Alexandre Poirot [:ochameau]]

Attachment: Use "b2g" package name instead of "browser"

I think that's ready to land. I tried to check if any ressouce from chrome/content/*
was somehow silently overloading chrome://browser/content/ resources.
It looks like none of them actually does that.
The only that overloads existing resources from browser/ are aboutCertError and other,
and uses override rule in jar.mn.
I tried on the device and "it works". I also identified two missing images related to aboutCertError (arrows),
I added them, and you can now see them appear in cert error page (ex, on https://linuxfr.org).

But I may easily be missing something...

https://tbpl.mozilla.org/?tree=Try&rev=aff7b69540cf

Comment 3

[[:fabrice] Fabrice Desré]

Comment on attachment 8370084 [details] [diff] [review]
Use "b2g" package name instead of "browser"

Review of attachment 8370084 [details] [diff] [review]:
-----------------------------------------------------------------

Thanks Alex, lgtm.

::: b2g/app/b2g.js
@@ +137,5 @@
>  pref("accessibility.typeaheadfind.linksonly", false);
>  pref("accessibility.typeaheadfind.casesensitive", 0);
>  
>  // pointer to the default engine name
> +pref("browser.search.defaultenginename", "chrome://b2g/locale/region.properties");

tbh I think we just don't need that pref at all for b2g.

Comment 4

[Alexandre Poirot [:ochameau]]

Attachment: patch, removed defaultengine

Yes, it looks like defaultengine isn't really used in b2g.
The main usage of it outside of browser/ is in docshell:
  http://mxr.mozilla.org/mozilla-central/source/docshell/base/nsDefaultURIFixup.cpp#388
But b2g unset MOZ_TOOLKIT_SEARCH here:
  http://mxr.mozilla.org/mozilla-central/source/b2g/confvars.sh#55

Comment 5

[Alexandre Poirot [:ochameau]]

Previous try refused to execute to run gaia tests:
  https://tbpl.mozilla.org/?tree=Try&rev=f81a1bff28b3

Comment 6

[Alexandre Poirot [:ochameau]]

I can't get a green Gaia ui test, but it looks like intermittents?
Failing tests are about alarms, I verified on device that we can still set an alarm.

Comment 7

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/fx-team/rev/1f36e3d0f5a7

Comment 8

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/1f36e3d0f5a7