wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nathan Toone 2014-04-26 11:27:00 -04:00
parent 15d86a0541
commit e5d56fd52c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/android/base/moz.build
View File

@ -557,8 +557,8 @@ main.recursive_make_targets += [OBJDIR + '/generated/' + f for f in gbjar.genera
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/fennec/assets'
main.libs = TOPOBJDIR + '/dist/fennec/lib'
main.assets = TOPOBJDIR + '/dist/' + CONFIG['MOZ_APP_NAME'] + '/assets'
main.libs = TOPOBJDIR + '/dist/' + CONFIG['MOZ_APP_NAME'] + '/lib'
main.res = None
cpe = main.add_classpathentry('src', SRCDIR,

2
mobile/android/geckoview_library/Makefile.in
View File

@ -36,7 +36,7 @@ package: local.properties project.properties AndroidManifest.xml FORCE
$(MKDIR) -p $(_ABS_DIST)/geckoview_library
# Zip the assets into $(DIST)/geckoview_library/geckoview_assets.zip
cd $(_ABS_DIST)/fennec && \
cd $(_ABS_DIST)/$(MOZ_APP_NAME) && \
$(ZIP) -q -r $(_ABS_DIST)/geckoview_library/geckoview_assets.zip assets
# Make empty directories to fit an Android project structure