1001611 - Cannot build with custom set MOZ_APP_NAME

Status: RESOLVED FIXED

(Firefox Build System :: Android Studio and Gradle Integration, defect)

Description

[Nathan Toone [:toonetown]]

Attachment: geckoview_library.diff

User Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.75.14 (KHTML, like Gecko) Version/7.0.3 Safari/537.75.14

Steps to reproduce:

Built with a custom MOZ_APP_NAME


Actual results:

Could not package geckoview_library because it's trying to access files in $(_ABS_DIST)/fennec


Expected results:

It should reference the files in $(_ABS_DIST)/$(MOZ_APP_NAME)

Comment 1

[Nathan Toone [:toonetown]]

The attached patch fixes this issue

Comment 2

[Kevin Brosnan [Ex-Mozilla]]

The patch needs a reviewer. https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide/How_to_Submit_a_Patch#Getting_the_patch_reviewed

Comment 3

[Nathan Toone [:toonetown]]

Attachment: 1001611-revised.diff

Found another location where the correct resources were not getting packaged when building with a custom MOZ_APP_NAME.

Comment 4

[Nick Alexander :nalexander [he/him]]

Comment on attachment 8413226 [details] [diff] [review]
1001611-revised.diff

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

Thanks for the patch! r+ with the issue below addressed; and I prefer specific commit messages saying what was done, such as:

Bug 1001611: Use MOZ_APP_NAME instead of hardcoded 'fennec' in mobile/android. r=nalexander

::: mobile/android/base/moz.build
@@ +556,4 @@
>  main.included_projects += ['../' + generated.name, '../' + branding.name]
>  main.referenced_projects += [generated.name, branding.name]
>  main.extra_jars += [CONFIG['ANDROID_COMPAT_LIB']]
> +main.assets = TOPOBJDIR + '/dist/' + [CONFIG['MOZ_APP_NAME']] + '/assets'

[CONFIG['MOZ_APP_NAME']] is a list-of-one-string, so this is not right.  Drop the outer brackets.

Comment 5

[Nathan Toone [:toonetown]]

Attachment: Remove extra brackets, change commit message, and format for HG

Comment 6

[Nathan Toone [:toonetown]]

Comment on attachment 8413235 [details] [diff] [review]
Remove extra brackets, change commit message, and format for HG

Carrying over r+

Comment 7

[Nathan Toone [:toonetown]]

Attachment: Remove extra brackets, change commit message, and format for HG

Adding r=nalexander to the commit message

Comment 8

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/585be2b04378

Comment 9

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/585be2b04378