Bug 1041208 - Flatten chrome/{public,src}/ directories. r=mossop

--HG-- rename : chrome/src/Makefile.in => chrome/Makefile.in rename : chrome/src/RegistryMessageUtils.h => chrome/RegistryMessageUtils.h rename : chrome/src/nsChromeProtocolHandler.cpp => chrome/nsChromeProtocolHandler.cpp rename : chrome/src/nsChromeProtocolHandler.h => chrome/nsChromeProtocolHandler.h rename : chrome/src/nsChromeRegistry.cpp => chrome/nsChromeRegistry.cpp rename : chrome/src/nsChromeRegistry.h => chrome/nsChromeRegistry.h rename : chrome/src/nsChromeRegistryChrome.cpp => chrome/nsChromeRegistryChrome.cpp rename : chrome/src/nsChromeRegistryChrome.h => chrome/nsChromeRegistryChrome.h rename : chrome/src/nsChromeRegistryContent.cpp => chrome/nsChromeRegistryContent.cpp rename : chrome/src/nsChromeRegistryContent.h => chrome/nsChromeRegistryContent.h rename : chrome/public/nsIChromeRegistry.idl => chrome/nsIChromeRegistry.idl rename : chrome/public/nsIToolkitChromeRegistry.idl => chrome/nsIToolkitChromeRegistry.idl
EtlerEdelgard · Jul 19, 2014 · fbc73fc · fbc73fc
1 parent 0c6b467
commit fbc73fc
Show file tree

Hide file tree

Showing 18 changed files with 37 additions and 49 deletions.
diff --git a/chrome/src/Makefile.in → chrome/Makefile.in b/chrome/src/Makefile.in → chrome/Makefile.in
diff --git a/chrome/src/RegistryMessageUtils.h → chrome/RegistryMessageUtils.h b/chrome/src/RegistryMessageUtils.h → chrome/RegistryMessageUtils.h
diff --git a/chrome/moz.build b/chrome/moz.build
@@ -4,5 +4,38 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['public', 'src']
 TEST_DIRS += ['test']
+
+XPIDL_SOURCES += [
+    'nsIChromeRegistry.idl',
+    'nsIToolkitChromeRegistry.idl',
+]
+
+XPIDL_MODULE = 'chrome'
+
+EXPORTS.mozilla.chrome += [
+    'RegistryMessageUtils.h',
+]
+
+UNIFIED_SOURCES += [
+    'nsChromeProtocolHandler.cpp',
+    'nsChromeRegistry.cpp',
+    'nsChromeRegistryChrome.cpp',
+    'nsChromeRegistryContent.cpp',
+]
+
+MSVC_ENABLE_PGO = True
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'xpcom_core'
+
+GENERATED_INCLUDES += [
+    '/xpcom',
+]
+
+LOCAL_INCLUDES += [
+    '/netwerk/base/src',
+    '/netwerk/protocol/res',
+    '/xpcom/components'
+]
diff --git a/chrome/src/nsChromeProtocolHandler.cpp → chrome/nsChromeProtocolHandler.cpp b/chrome/src/nsChromeProtocolHandler.cpp → chrome/nsChromeProtocolHandler.cpp
diff --git a/chrome/src/nsChromeProtocolHandler.h → chrome/nsChromeProtocolHandler.h b/chrome/src/nsChromeProtocolHandler.h → chrome/nsChromeProtocolHandler.h
diff --git a/chrome/src/nsChromeRegistry.cpp → chrome/nsChromeRegistry.cpp b/chrome/src/nsChromeRegistry.cpp → chrome/nsChromeRegistry.cpp
diff --git a/chrome/src/nsChromeRegistry.h → chrome/nsChromeRegistry.h b/chrome/src/nsChromeRegistry.h → chrome/nsChromeRegistry.h
diff --git a/chrome/src/nsChromeRegistryChrome.cpp → chrome/nsChromeRegistryChrome.cpp b/chrome/src/nsChromeRegistryChrome.cpp → chrome/nsChromeRegistryChrome.cpp
diff --git a/chrome/src/nsChromeRegistryChrome.h → chrome/nsChromeRegistryChrome.h b/chrome/src/nsChromeRegistryChrome.h → chrome/nsChromeRegistryChrome.h
diff --git a/chrome/src/nsChromeRegistryContent.cpp → chrome/nsChromeRegistryContent.cpp b/chrome/src/nsChromeRegistryContent.cpp → chrome/nsChromeRegistryContent.cpp
diff --git a/chrome/src/nsChromeRegistryContent.h → chrome/nsChromeRegistryContent.h b/chrome/src/nsChromeRegistryContent.h → chrome/nsChromeRegistryContent.h
diff --git a/chrome/public/nsIChromeRegistry.idl → chrome/nsIChromeRegistry.idl b/chrome/public/nsIChromeRegistry.idl → chrome/nsIChromeRegistry.idl
diff --git a/chrome/public/nsIToolkitChromeRegistry.idl → chrome/nsIToolkitChromeRegistry.idl b/chrome/public/nsIToolkitChromeRegistry.idl → chrome/nsIToolkitChromeRegistry.idl
diff --git a/chrome/public/moz.build b/chrome/public/moz.build
diff --git a/chrome/src/moz.build b/chrome/src/moz.build
diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build
@@ -106,7 +106,7 @@ LOCAL_INCLUDES += [
     '../src/base',
     '../src/geolocation',
     '../src/storage',
-    '/chrome/src',
+    '/chrome',
     '/content/base/src',
     '/content/media/webspeech/synth/ipc',
     '/docshell/base',

diff --git a/xpcom/build/moz.build b/xpcom/build/moz.build
@@ -91,7 +91,7 @@ LOCAL_INCLUDES += [
     '../io',
     '../reflect/xptinfo',
     '../threads',
-    '/chrome/src',
+    '/chrome',
     '/docshell/base',
 ]
 

diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
@@ -50,6 +50,6 @@ LOCAL_INCLUDES += [
     '../build',
     '../ds',
     '../reflect/xptinfo',
-    '/chrome/src',
+    '/chrome',
     '/modules/libjar',
 ]