Bug 1435230 - Don't build SkiaPDF for Windows Nightly. r=glandium
authorJonathan Watt <jwatt@jwatt.org>
Wed, 21 Feb 2018 14:54:27 +0000
changeset 408487 c2dafc93af5e22280bd220222bfba2b7a0368b56
parent 408486 0f81334efa0a008db8931a41eef2d26a77d0e800
child 408488 d7c420c8dc2a6b28500eae0e35cd9f17a22908ec
push id100957
push userjwatt@jwatt.org
push dateFri, 16 Mar 2018 13:31:38 +0000
treeherdermozilla-inbound@d7c420c8dc2a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1435230
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1435230 - Don't build SkiaPDF for Windows Nightly. r=glandium MozReview-Commit-ID: JxCOILSLRtb
toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -965,22 +965,22 @@ def skia_gpu(value, skia, target):
     if skia and value:
         return True
 
 set_config('MOZ_ENABLE_SKIA_GPU', skia_gpu)
 set_define('USE_SKIA_GPU', skia_gpu)
 
 option('--enable-skia-pdf', help='Enable Skia PDF')
 
-@depends('--enable-skia-pdf', skia, milestone)
-def skia_pdf(value, skia, milestone):
+@depends('--enable-skia-pdf', skia, target, milestone)
+def skia_pdf(value, skia, target, milestone):
     if value.origin == 'default':
         if not skia:
             return None
-        if milestone.is_nightly:
+        if milestone.is_nightly and target.os != 'WINNT':
             return True
     elif value and not skia:
         die('Cannot enable Skia PDF without enabling Skia')
     if skia and value:
         return True
 
 set_config('MOZ_ENABLE_SKIA_PDF', skia_pdf)
 set_define('MOZ_ENABLE_SKIA_PDF', skia_pdf)