Bug 1373486 - Skip gyp directories when building without a compile environment. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 16 Jun 2017 11:30:43 +0900
changeset 413149 e32d7bb6a79e42ed96b54c8467d532996e0fc97f
parent 413148 6ac2d61a3904bbc52d0027ff4e12a6f94f1ce585
child 413150 12f0f85e4ade15e87e533bc7f0f2549b89e02109
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1373486
milestone56.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 1373486 - Skip gyp directories when building without a compile environment. r=mshal security/ is already skipped through top-level moz.build. For convenience, we skip the DIRS that end up adding GYP_DIRS, avoiding reindenting their entire moz.build.
toolkit/toolkit.mozbuild
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -41,32 +41,36 @@ if CONFIG['MOZ_UPDATER']:
 # Gecko/Core components.
 
 DIRS += [
     '/ipc',
     '/js/ipc',
     '/hal',
     '/js/xpconnect',
     '/intl/chardet',
-    '/media/libyuv',
     '/modules/libjar',
     '/storage',
 ]
 
+if CONFIG['COMPILE_ENVIRONMENT']:
+    DIRS += [
+        '/media/libyuv',
+    ]
+
 if CONFIG['MOZ_PERMISSIONS']:
     DIRS += [
         '/extensions/cookie',
         '/extensions/permissions',
     ]
 
 DIRS += [
     '/rdf',
 ]
 
-if CONFIG['MOZ_WEBRTC']:
+if CONFIG['MOZ_WEBRTC'] and CONFIG['COMPILE_ENVIRONMENT']:
     DIRS += [
         '/media/webrtc',
         '/media/mtransport',
     ]
 
 if CONFIG['MOZ_OMX_PLUGIN']:
     DIRS += [
         '/media/omx-plugin/lib/ics/libutils',