Bug 1533428 - patch 4 - Include chromium-config.mozbuild in the moz.build for a bunch more directories, so that IPC-related headers are available. r=jwatt

jfkthame · jfkthame · commit f5e8791f61a2 · 2019-04-01T14:32:44.000Z
Differential Revision: https://phabricator.services.mozilla.com/D22922 --HG-- extra : moz-landing-system : lando
diff --git a/dom/xbl/moz.build b/dom/xbl/moz.build
@@ -49,6 +49,8 @@ LOCAL_INCLUDES += [
     '/layout/style',
 ]
 
+include('/ipc/chromium/chromium-config.mozbuild')
+
 FINAL_LIBRARY = 'xul'
 
 MOCHITEST_MANIFESTS += ['test/mochitest.ini']
diff --git a/dom/xul/moz.build b/dom/xul/moz.build
@@ -76,6 +76,8 @@ LOCAL_INCLUDES += [
     '/layout/xul/tree',
 ]
 
+include('/ipc/chromium/chromium-config.mozbuild')
+
 FINAL_LIBRARY = 'xul'
 
 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
diff --git a/layout/inspector/moz.build b/layout/inspector/moz.build
@@ -31,6 +31,8 @@ UNIFIED_SOURCES += [
     'ServoStyleRuleMap.cpp',
 ]
 
+include('/ipc/chromium/chromium-config.mozbuild')
+
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../style',
diff --git a/layout/mathml/moz.build b/layout/mathml/moz.build
@@ -44,6 +44,8 @@ EXPORTS += [
     'nsMathMLOperators.h'
 ]
 
+include('/ipc/chromium/chromium-config.mozbuild')
+
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../base',
diff --git a/layout/svg/moz.build b/layout/svg/moz.build
@@ -69,6 +69,8 @@ UNIFIED_SOURCES += [
     'SVGViewFrame.cpp',
 ]
 
+include('/ipc/chromium/chromium-config.mozbuild')
+
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../../widget',
diff --git a/layout/tools/layout-debug/src/moz.build b/layout/tools/layout-debug/src/moz.build
@@ -20,4 +20,6 @@ UNIFIED_SOURCES += [
     'nsLayoutDebuggingTools.cpp',
 ]
 
+include('/ipc/chromium/chromium-config.mozbuild')
+
 FINAL_LIBRARY = 'xul'
diff --git a/layout/xul/tree/moz.build b/layout/xul/tree/moz.build
@@ -31,6 +31,8 @@ UNIFIED_SOURCES += [
     'nsTreeUtils.cpp',
 ]
 
+include('/ipc/chromium/chromium-config.mozbuild')
+
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '..',
diff --git a/toolkit/components/satchel/moz.build b/toolkit/components/satchel/moz.build
@@ -40,6 +40,8 @@ XPCOM_MANIFESTS += [
     'components.conf',
 ]
 
+include('/ipc/chromium/chromium-config.mozbuild')
+
 FINAL_TARGET_FILES.actors += [
     'FormSubmitChild.jsm',
 ]
diff --git a/view/moz.build b/view/moz.build
@@ -17,6 +17,8 @@ UNIFIED_SOURCES += [
     'nsViewManager.cpp',
 ]
 
+include('/ipc/chromium/chromium-config.mozbuild')
+
 FINAL_LIBRARY = 'xul'
 
 CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
diff --git a/xpcom/reflect/xptinfo/moz.build b/xpcom/reflect/xptinfo/moz.build
@@ -16,4 +16,6 @@ EXPORTS += [
     'xptinfo.h',
 ]
 
+include('/ipc/chromium/chromium-config.mozbuild')
+
 FINAL_LIBRARY = 'xul'

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,8 @@ LOCAL_INCLUDES += [`
`49`	`49`	`'/layout/style',`
`50`	`50`	`]`
`51`	`51`
	`52`	`+include('/ipc/chromium/chromium-config.mozbuild')`
	`53`	`+`
`52`	`54`	`FINAL_LIBRARY = 'xul'`
`53`	`55`
`54`	`56`	`MOCHITEST_MANIFESTS += ['test/mochitest.ini']`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,8 @@ LOCAL_INCLUDES += [`
`76`	`76`	`'/layout/xul/tree',`
`77`	`77`	`]`
`78`	`78`
	`79`	`+include('/ipc/chromium/chromium-config.mozbuild')`
	`80`	`+`
`79`	`81`	`FINAL_LIBRARY = 'xul'`
`80`	`82`
`81`	`83`	`if CONFIG['CC_TYPE'] in ('clang', 'gcc'):`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ UNIFIED_SOURCES += [`
`31`	`31`	`'ServoStyleRuleMap.cpp',`
`32`	`32`	`]`
`33`	`33`
	`34`	`+include('/ipc/chromium/chromium-config.mozbuild')`
	`35`	`+`
`34`	`36`	`FINAL_LIBRARY = 'xul'`
`35`	`37`	`LOCAL_INCLUDES += [`
`36`	`38`	`'../style',`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,8 @@ EXPORTS += [`
`44`	`44`	`'nsMathMLOperators.h'`
`45`	`45`	`]`
`46`	`46`
	`47`	`+include('/ipc/chromium/chromium-config.mozbuild')`
	`48`	`+`
`47`	`49`	`FINAL_LIBRARY = 'xul'`
`48`	`50`	`LOCAL_INCLUDES += [`
`49`	`51`	`'../base',`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,8 @@ UNIFIED_SOURCES += [`
`69`	`69`	`'SVGViewFrame.cpp',`
`70`	`70`	`]`
`71`	`71`
	`72`	`+include('/ipc/chromium/chromium-config.mozbuild')`
	`73`	`+`
`72`	`74`	`FINAL_LIBRARY = 'xul'`
`73`	`75`	`LOCAL_INCLUDES += [`
`74`	`76`	`'../../widget',`
Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,6 @@ UNIFIED_SOURCES += [`
`20`	`20`	`'nsLayoutDebuggingTools.cpp',`
`21`	`21`	`]`
`22`	`22`
	`23`	`+include('/ipc/chromium/chromium-config.mozbuild')`
	`24`	`+`
`23`	`25`	`FINAL_LIBRARY = 'xul'`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,8 @@ XPCOM_MANIFESTS += [`
`40`	`40`	`'components.conf',`
`41`	`41`	`]`
`42`	`42`
	`43`	`+include('/ipc/chromium/chromium-config.mozbuild')`
	`44`	`+`
`43`	`45`	`FINAL_TARGET_FILES.actors += [`
`44`	`46`	`'FormSubmitChild.jsm',`
`45`	`47`	`]`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ UNIFIED_SOURCES += [`
`17`	`17`	`'nsViewManager.cpp',`
`18`	`18`	`]`
`19`	`19`
	`20`	`+include('/ipc/chromium/chromium-config.mozbuild')`
	`21`	`+`
`20`	`22`	`FINAL_LIBRARY = 'xul'`
`21`	`23`
`22`	`24`	`CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,6 @@ EXPORTS += [`
`16`	`16`	`'xptinfo.h',`
`17`	`17`	`]`
`18`	`18`
	`19`	`+include('/ipc/chromium/chromium-config.mozbuild')`
	`20`	`+`
`19`	`21`	`FINAL_LIBRARY = 'xul'`