Bug 1265486 - Use flat chrome format for mobile/android builds. r?chmanchester draft
authorMike Hommey <mh+mozilla@glandium.org>
Sun, 01 May 2016 08:02:43 +0900
changeset 358079 272f1909a1163e0d0dbca159fdc4f0abb40ddab7
parent 356337 f33fc3066c0725ed393e3e3f2ab29ff1c5e444a8
child 519785 d96c035cf7ab87ec2cbf283718078511c017c228
push id16937
push userbmo:mh+mozilla@glandium.org
push dateSat, 30 Apr 2016 23:05:43 +0000
reviewerschmanchester
bugs1265486
milestone48.0a1
Bug 1265486 - Use flat chrome format for mobile/android builds. r?chmanchester
toolkit/moz.configure
--- 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