Bug 1060198, part 2: Move other IS_GYP_DIR rules to gyp_reader.py, r=glandium.

--HG--
extra : rebase_source : 5ad6eae63688f5582568f470b7266b0f7ebc8b6c

config/config.mk

@@ -756,20 +756,5 @@ export NONASCII
 
 DEFINES += -DNO_NSPR_10_SUPPORT
 
-ifdef IS_GYP_DIR
-LOCAL_INCLUDES += \
-  -I$(topsrcdir)/ipc/chromium/src \
-  -I$(topsrcdir)/ipc/glue \
-  -I$(DEPTH)/ipc/ipdl/_ipdlheaders \
-  $(NULL)
-
-ifeq (WINNT,$(OS_TARGET))
-# These get set via VC project file settings for normal GYP builds.
-DEFINES += -DUNICODE -D_UNICODE
-endif
-
-DISABLE_STL_WRAPPING := 1
-endif
-
 # Freeze the values specified by moz.build to catch them if they fail.
 $(foreach var,$(_MOZBUILD_EXTERNAL_VARIABLES) $(_DEPRECATED_VARIABLES),$(eval $(var)_FROZEN := '$($(var))'))

python/mozbuild/mozbuild/frontend/gyp_reader.py

@@ -213,6 +213,19 @@ def read_from_gyp(config, path, output, vars, non_unified_sources = set()):
             # added when that becomes necessary.
             raise NotImplementedError('Unsupported gyp target type: %s' % spec['type'])
 
+        # Add some features to all contexts. Put here in case LOCAL_INCLUDES
+        # order matters.
+        context['LOCAL_INCLUDES'] += [
+            '/ipc/chromium/src',
+            '/ipc/glue',
+        ]
+        context['GENERATED_INCLUDES'] += ['/ipc/ipdl/_ipdlheaders']
+        # These get set via VC project file settings for normal GYP builds.
+        if config.substs['OS_TARGET'] == 'WINNT':
+            context['DEFINES']['UNICODE'] = True
+            context['DEFINES']['_UNICODE'] = True
+        context['DISABLE_STL_WRAPPING'] = True
+
         context.execution_time = time.time() - time_start
         yield context
         time_start = time.time()