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.
--- 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',