Closed Bug 1001611 Opened 6 years ago Closed 6 years ago

Cannot build with custom set MOZ_APP_NAME

Categories

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

All
Android
defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED
mozilla31

People

(Reporter: toonetown, Assigned: toonetown)

Details

Attachments

(1 file, 3 obsolete files)

Attached patch geckoview_library.diff (obsolete) — Splinter Review
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)
The attached patch fixes this issue
Attachment #8412840 - Attachment is patch: true
Attachment #8412840 - Attachment mime type: text/x-patch → text/plain
Component: General → Build Config & IDE Support
Attached patch 1001611-revised.diff (obsolete) — Splinter Review
Found another location where the correct resources were not getting packaged when building with a custom MOZ_APP_NAME.
Attachment #8412840 - Attachment is obsolete: true
Attachment #8413226 - Flags: review?(nalexander)
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.
Attachment #8413226 - Flags: review?(nalexander) → review+
Attachment #8413226 - Attachment is obsolete: true
Comment on attachment 8413235 [details] [diff] [review]
Remove extra brackets, change commit message, and format for HG

Carrying over r+
Attachment #8413235 - Flags: review+
Keywords: checkin-needed
Adding r=nalexander to the commit message
Attachment #8413235 - Attachment is obsolete: true
Attachment #8413243 - Flags: review+
Assignee: nobody → nathan
Status: UNCONFIRMED → ASSIGNED
Ever confirmed: true
https://hg.mozilla.org/mozilla-central/rev/585be2b04378
Status: ASSIGNED → RESOLVED
Closed: 6 years ago
Resolution: --- → FIXED
Target Milestone: --- → Firefox 31
Product: Firefox for Android → Firefox Build System
Target Milestone: Firefox 31 → mozilla31
You need to log in before you can comment on or make changes to this bug.