Bug 1265486 - Use flat chrome format for mobile/android builds. r?chmanchester
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -365,19 +365,23 @@ option(name='--enable-chrome-format',
default='omni')
@depends('--enable-chrome-format')
def packager_format(value):
return value[0]
set_config('MOZ_PACKAGER_FORMAT', packager_format)
-@depends(host)
-def jar_maker_format(host):
- return 'flat' if host.os == 'WINNT' else 'symlink'
+@depends(host, build_project)
+def jar_maker_format(host, build_project):
+ # Multilocales for mobile/android use the same mergedirs for all locales,
+ # so we can't use symlinks for those builds.
+ if host.os == 'WINNT' or build_project == 'mobile/android':
+ return 'flat'
+ return 'symlink'
set_config('MOZ_JAR_MAKER_FILE_FORMAT', jar_maker_format)
@depends(toolkit)
def omnijar_name(toolkit):
# Fennec's static resources live in the assets/ folder of the
# APK. Adding a path to the name here works because we only
# have one omnijar file in the final package (which is not the