1180461 - Package gaia in b2gdroid

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: General, defect)

Comment 1

[[:fabrice] Fabrice Desré]

Attachment: b2gdroid-package-gaia.patch

That builds gaia and add it in the .apk's asset directory.

Comment 2

[[:fabrice] Fabrice Desré]

Attachment: b2gdroid-package-gaia.patch

Try run at https://treeherder.mozilla.org/#/jobs?repo=try&revision=17dc79b0e732

Comment 3

[Nick Alexander :nalexander [he/him]]

Comment on attachment 8629760 [details] [diff] [review]
b2gdroid-package-gaia.patch

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

r+ because this will do what it says on the tin, provided that DIRS is ordered.

But: is there a compelling reason to route through dist/?  You could expose GAIADIR to the build system (if it isn't already), and then include GAIADIR/profile where appropriate.  I.e., not to GeckoView, but to the b2gdroid App.

::: mobile/android/b2gdroid/config/mozconfigs/common
@@ +61,5 @@
>  mk_add_options "export PATH=$topsrcdir/apache-ant/bin:$PATH"
>  
>  JS_BINARY="$topsrcdir/mobile/android/config/js_wrapper.sh"
> +
> +GAIADIR="$topsrcdir/gaia"

Is there a reason that you have GAIA_ and no underscore here?  Are you following suit with b2g/?

::: mobile/android/b2gdroid/gaia/Makefile.in
@@ +9,5 @@
> +
> +include $(topsrcdir)/config/rules.mk
> +
> +libs::
> +	+$(MAKE) -j4 -C $(GAIADIR) clean

Why clean?  Also, why force -j4?

::: mobile/android/base/moz.build
@@ +629,5 @@
>      gbjar.sources += b2gdroid_java_files
>      ANDROID_RES_DIRS += [ TOPSRCDIR + '/mobile/android/b2gdroid/base/resources']
> +    ANDROID_ASSETS_DIRS += [
> +        # Would be less ugly if we had some kind of ROOT_OBJDIR.
> +        OBJDIR + '/../../../dist/bin/gaia',

We do -- TOPOBJDIR.

Comment 4

[Nick Alexander :nalexander [he/him]]

Comment on attachment 8629760 [details] [diff] [review]
b2gdroid-package-gaia.patch

That was meant to be an "r+".

Comment 5

[Nick Alexander :nalexander [he/him]]

glandium: can you look at this, and confirm that DIRS is ordered?

Comment 6

[Mike Hommey [:glandium]]

Comment on attachment 8629760 [details] [diff] [review]
b2gdroid-package-gaia.patch

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

::: mobile/android/b2gdroid/gaia/Makefile.in
@@ +9,5 @@
> +
> +include $(topsrcdir)/config/rules.mk
> +
> +libs::
> +	+$(MAKE) -j4 -C $(GAIADIR) clean

I'll venture a guess: because gaia's build system sucks. And because b2g/gaia/Makefile.in does the same.

Which bring me to thinking there's no reason these rules shouldn't be shared between b2g and b2gdroid.

::: mobile/android/base/moz.build
@@ +629,5 @@
>      gbjar.sources += b2gdroid_java_files
>      ANDROID_RES_DIRS += [ TOPSRCDIR + '/mobile/android/b2gdroid/base/resources']
> +    ANDROID_ASSETS_DIRS += [
> +        # Would be less ugly if we had some kind of ROOT_OBJDIR.
> +        OBJDIR + '/../../../dist/bin/gaia',

Time to file a bug to move ANDROID_*_DIRS to using Path classes.

Comment 7

[Mike Hommey [:glandium]]

(In reply to Nick Alexander :nalexander (PTO July 17-27) from comment #5)
> glandium: can you look at this, and confirm that DIRS is ordered?

DIRS is not StrictOrderingOnAppendList

Comment 8

[Nick Alexander :nalexander [he/him]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=e5e9971d4e04

Comment 9

[Nick Alexander :nalexander [he/him]]

The try build above is some hacky WIP to build b2gdroid as a GeckoView consumer.  The build should fail because GAIADIR is not configured.

Locally, that work produces a working b2gdroid APK.  The work isn't ready to land 'cuz other bits of the build need to be updated for the java-build.mk changes.  But it shows the way.

Comment 10

[Pulsebot]

https://hg.mozilla.org/integration/fx-team/rev/bf768f510072
https://hg.mozilla.org/integration/fx-team/rev/6c3aca3d7e73

Comment 11

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/bf768f510072
https://hg.mozilla.org/mozilla-central/rev/6c3aca3d7e73