Bug 1100184 - Flatten netwerk/streamconv/(public|src)/ directories. r=mcmanus, r=poiru

netwerk/build/moz.build

@@ -28,8 +28,8 @@ LOCAL_INCLUDES += [
     '../protocol/about',
     '../protocol/app',
     '../socket',
+    '../streamconv',
     '../streamconv/converters',
-    '../streamconv/src',
 ]
 
 protocols = CONFIG['NECKO_PROTOCOLS'].copy()

netwerk/streamconv/moz.build

@@ -4,5 +4,26 @@
 # 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', 'converters']
+DIRS += ['converters']
 TEST_DIRS += ['test']
+
+XPIDL_SOURCES += [
+    'mozITXTToHTMLConv.idl',
+    'nsIDirIndex.idl',
+    'nsIDirIndexListener.idl',
+    'nsIStreamConverter.idl',
+    'nsIStreamConverterService.idl',
+    'nsITXTToHTMLConv.idl',
+]
+
+SOURCES += [
+    'nsStreamConverterService.cpp',
+]
+
+XPIDL_MODULE = 'necko_strconv'
+
+FAIL_ON_WARNINGS = True
+
+MSVC_ENABLE_PGO = True
+
+FINAL_LIBRARY = 'xul'

netwerk/streamconv/public/moz.build

@@ -1,19 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-XPIDL_SOURCES += [
-    'mozITXTToHTMLConv.idl',
-    'nsIDirIndex.idl',
-    'nsIDirIndexListener.idl',
-    'nsIStreamConverter.idl',
-    'nsIStreamConverterService.idl',
-    'nsITXTToHTMLConv.idl',
-]
-
-XPIDL_MODULE = 'necko_strconv'
-
-FAIL_ON_WARNINGS = True
-

netwerk/streamconv/src/moz.build

@@ -1,15 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-FAIL_ON_WARNINGS = True
-
-SOURCES += [
-    'nsStreamConverterService.cpp',
-]
-
-MSVC_ENABLE_PGO = True
-
-FINAL_LIBRARY = 'xul'