1258372 - Can't package distribution files with --with-android-distribution-directory

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: Android partner distribution, defect)

Description

[Sebastian Kaspari (:sebastian; :pocmo)]

I added to my mozconfig file:
> ac_add_options --with-android-distribution-directory=/path/to/directory

But the distribution files do not end up in the APK. I tried running |mach configure| and also |mach clobber| before building/packaging but it does not help.

However adding the folder (with "assets" appended) manually to my build.gradle works just fine:
> assets {
>     srcDir "/path/to/directory/assets"
> }

Comment 1

[Mike Kaply [:mkaply]]

Right now they are going into the bouncer APK.

In order to change that, you have to remove

MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER=1

from confvars.sh and rebuild. 

It's being worked on. Sorry about that.

Comment 2

[Sebastian Kaspari (:sebastian; :pocmo)]

Ah, I just wanted to comment about that. :)

I just realized that running gradle on the command line builds and installs the bouncer application too:

> TheSilence:fx-team sebastian$ ./mach gradle installDebug
> Parallel execution is an incubating feature.
> :bouncer:generateCodeAndResources
> :bouncer:preBuild UP-TO-DATE
> :bouncer:preDebugBuild
> [..]

Could/should this be a different target eventually?

Comment 3

[Nick Alexander :nalexander [he/him]]

(In reply to Sebastian Kaspari (:sebastian) from comment #2)
> Ah, I just wanted to comment about that. :)
> 
> I just realized that running gradle on the command line builds and installs
> the bouncer application too:
> 
> > TheSilence:fx-team sebastian$ ./mach gradle installDebug
> > Parallel execution is an incubating feature.
> > :bouncer:generateCodeAndResources
> > :bouncer:preBuild UP-TO-DATE
> > :bouncer:preDebugBuild
> > [..]
> 
> Could/should this be a different target eventually?

The Gradle configuration does the same as moz.build:

--with-android-distribution-directory, BOUNCER=1 => distribution in bouncer.apk
--with-android-distribution-directory, BOUNCER undefined => distribution in fennec.apk
no --with-android-distribution-directory => no distribution anywhere

If we prefer the distribution in the main APK by default, I'll r+ a patch to flip the switch in confvars.sh.  I had the bouncer building for test coverage right after landing.

Comment 4

[Mike Kaply [:mkaply]]

> If we prefer the distribution in the main APK by default, I'll r+ a patch to flip the switch in confvars.sh.  I had the bouncer building for test coverage right after landing.

Should we make it flippable via .mozconfig?

Comment 5

[Nick Alexander :nalexander [he/him]]

(In reply to Mike Kaply [:mkaply] from comment #4)
> > If we prefer the distribution in the main APK by default, I'll r+ a patch to flip the switch in confvars.sh.  I had the bouncer building for test coverage right after landing.
> 
> Should we make it flippable via .mozconfig?

Bug 1257958 will do this as a side-effect.  This is a larger problem with setting defaults in confvars.sh.

Comment 6

[Mike Kaply [:mkaply]]

I see all the infrastructure for this in the build because of Bug 1257958, but I still see  MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER=1 in confvars.sh.

http://mxr.mozilla.org/mozilla-central/source/mobile/android/confvars.sh#63

Will it override the value specified via .mozconfig?

Comment 7

[Nick Alexander :nalexander [he/him]]

(In reply to Mike Kaply [:mkaply] from comment #6)
> I see all the infrastructure for this in the build because of Bug 1257958,
> but I still see  MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER=1 in confvars.sh.
> 
> http://mxr.mozilla.org/mozilla-central/source/mobile/android/confvars.sh#63
> 
> Will it override the value specified via .mozconfig?

Yes, I think it will.  It requires some care to take a mozconfig value and fallback to confvars.sh if it's not specified, IIRC.  Patches welcome!

Comment 8

[Mike Kaply [:mkaply]]

(In reply to Nick Alexander :nalexander from comment #7)
> Yes, I think it will.  It requires some care to take a mozconfig value and
> fallback to confvars.sh if it's not specified, IIRC.  Patches welcome!

This was done in bug 1278959.

So do we need to do anything else in this bug?

Comment 9

[Nick Alexander :nalexander [he/him]]

(In reply to Mike Kaply [:mkaply] from comment #8)
> (In reply to Nick Alexander :nalexander from comment #7)
> > Yes, I think it will.  It requires some care to take a mozconfig value and
> > fallback to confvars.sh if it's not specified, IIRC.  Patches welcome!
> 
> This was done in bug 1278959.
> 
> So do we need to do anything else in this bug?

Not that I'm aware of.