Bug 1227380 - Move LOCAL_INCLUDES and CXXFLAGS to moz.build in dom/bindings/. r=mshal

dom/bindings/Makefile.in

@@ -8,22 +8,10 @@ webidl_base := $(topsrcdir)/dom/webidl
 # Generated by moz.build
 include webidlsrcs.mk
 
-ifdef GNU_CC
-OS_CXXFLAGS += -Wno-uninitialized
-endif
-
 # These come from webidlsrcs.mk.
 # TODO Write directly into backend.mk.
 CPPSRCS += $(globalgen_sources) $(unified_binding_cpp_files)
 
-# Generated bindings reference *Binding.h, not mozilla/dom/*Binding.h. And,
-# since we generate exported bindings directly to $(DIST)/include, we need
-# to add that path to the search list.
-#
-# Ideally, binding generation uses the prefixed header file names.
-# Bug 932092 tracks.
-LOCAL_INCLUDES += -I$(DIST)/include/mozilla/dom
-
 include $(topsrcdir)/config/rules.mk
 
 # TODO This list should be emitted to a .pp file via

dom/bindings/moz.build

@@ -40,6 +40,16 @@ EXPORTS.mozilla.dom += [
     'UnionMember.h',
 ]
 
+# Generated bindings reference *Binding.h, not mozilla/dom/*Binding.h. And,
+# since we generate exported bindings directly to $(DIST)/include, we need
+# to add that path to the search list.
+#
+# Ideally, binding generation uses the prefixed header file names.
+# Bug 932082 tracks.
+LOCAL_INCLUDES += [
+    '!/dist/include/mozilla/dom',
+]
+
 LOCAL_INCLUDES += [
     '/dom/base',
     '/dom/battery',
@@ -129,3 +139,8 @@ if CONFIG['MOZ_SIMPLEPUSH']:
 PYTHON_UNIT_TESTS += [
     'mozwebidlcodegen/test/test_mozwebidlcodegen.py',
 ]
+
+if CONFIG['GNU_CC']:
+    CXXFLAGS += [
+        '-Wno-uninitialized',
+    ]

dom/bindings/test/Makefile.in

@@ -8,13 +8,6 @@ include ../webidlsrcs.mk
 # TODO Update this variable in backend.mk.
 CPPSRCS += $(addprefix ../,$(test_sources))
 
-ifdef GNU_CC
-OS_CXXFLAGS += -Wno-uninitialized
-endif
-
-# Bug 932082 tracks having bindings use namespaced includes.
-LOCAL_INCLUDES += -I$(DIST)/include/mozilla/dom
-
 # Include rules.mk before any of our targets so our first target is coming from
 # rules.mk and running make with no target in this dir does the right thing.
 include $(topsrcdir)/config/rules.mk

dom/bindings/test/moz.build

@@ -41,9 +41,19 @@ WEBIDL_EXAMPLE_INTERFACES += [
     'TestExampleProxyInterface',
 ]
 
+# Bug 932082 tracks having bindings use namespaced includes.
+LOCAL_INCLUDES += [
+    '!/dist/include/mozilla/dom',
+]
+
 LOCAL_INCLUDES += [
     '!..',
     '/dom/bindings',
     '/js/xpconnect/src',
     '/js/xpconnect/wrappers',
 ]
+
+if CONFIG['GNU_CC']:
+    CXXFLAGS += [
+        '-Wno-uninitialized',
+    ]