Bug 1265486 - Use flat chrome format for mobile/android builds. r=chmanchester, a=lizzard
authorMike Hommey <mh+mozilla@glandium.org>
Sun, 01 May 2016 08:02:43 +0900
changeset 332638 3f5062c662dab3cda0c88b2d5b2971c729e2e1c3
parent 332637 3f169c95e542f059b6b07d11e7f73533bdbf03d6
child 332639 31c52d84503f2273fe794cfa8ea7e5bcaabc19ee
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester, lizzard
bugs1265486
milestone48.0a2
Bug 1265486 - Use flat chrome format for mobile/android builds. r=chmanchester, a=lizzard MozReview-Commit-ID: EYFTz7WeR97
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