Bug 1038537 - Part 7: Flatten intl/uconv/src/ directory. r=smontagu
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Thu, 24 Jul 2014 10:56:39 -0700
changeset 217666 4feaed7d41deb55fec4a214dba3db252a48e641b
parent 217665 0d7d58108070f7fae8f149e9f5b4209bec8bee12
child 217667 38b4378f21c0a8d20ed87b2dccd4b6b82cac12bf
push idunknown
push userunknown
push dateunknown
reviewerssmontagu
bugs1038537
milestone34.0a1
Bug 1038537 - Part 7: Flatten intl/uconv/src/ directory. r=smontagu
intl/build/moz.build
intl/locale/moz.build
intl/uconv/8859-1.uf
intl/uconv/8859-1.ut
intl/uconv/cp1252.uf
intl/uconv/cp1252.ut
intl/uconv/macroman.uf
intl/uconv/macroman.ut
intl/uconv/moz.build
intl/uconv/nsCP1252ToUnicode.cpp
intl/uconv/nsCP1252ToUnicode.h
intl/uconv/nsConverterInputStream.cpp
intl/uconv/nsConverterInputStream.h
intl/uconv/nsConverterOutputStream.cpp
intl/uconv/nsConverterOutputStream.h
intl/uconv/nsISO88591ToUnicode.cpp
intl/uconv/nsISO88591ToUnicode.h
intl/uconv/nsMacRomanToUnicode.cpp
intl/uconv/nsMacRomanToUnicode.h
intl/uconv/nsReplacementToUnicode.cpp
intl/uconv/nsReplacementToUnicode.h
intl/uconv/nsScriptableUConv.cpp
intl/uconv/nsScriptableUConv.h
intl/uconv/nsTextToSubURI.cpp
intl/uconv/nsTextToSubURI.h
intl/uconv/nsUConvModule.cpp
intl/uconv/nsUTF8ConverterService.cpp
intl/uconv/nsUTF8ConverterService.h
intl/uconv/nsUTF8ToUnicode.cpp
intl/uconv/nsUTF8ToUnicode.h
intl/uconv/nsUTF8ToUnicodeSSE2.cpp
intl/uconv/nsUnicodeToCP1252.cpp
intl/uconv/nsUnicodeToCP1252.h
intl/uconv/nsUnicodeToISO88591.cpp
intl/uconv/nsUnicodeToISO88591.h
intl/uconv/nsUnicodeToMacRoman.cpp
intl/uconv/nsUnicodeToMacRoman.h
intl/uconv/nsUnicodeToUTF8.cpp
intl/uconv/nsUnicodeToUTF8.h
intl/uconv/src/8859-1.uf
intl/uconv/src/8859-1.ut
intl/uconv/src/cp1252.uf
intl/uconv/src/cp1252.ut
intl/uconv/src/macroman.uf
intl/uconv/src/macroman.ut
intl/uconv/src/moz.build
intl/uconv/src/nsCP1252ToUnicode.cpp
intl/uconv/src/nsCP1252ToUnicode.h
intl/uconv/src/nsConverterInputStream.cpp
intl/uconv/src/nsConverterInputStream.h
intl/uconv/src/nsConverterOutputStream.cpp
intl/uconv/src/nsConverterOutputStream.h
intl/uconv/src/nsISO88591ToUnicode.cpp
intl/uconv/src/nsISO88591ToUnicode.h
intl/uconv/src/nsMacRomanToUnicode.cpp
intl/uconv/src/nsMacRomanToUnicode.h
intl/uconv/src/nsReplacementToUnicode.cpp
intl/uconv/src/nsReplacementToUnicode.h
intl/uconv/src/nsScriptableUConv.cpp
intl/uconv/src/nsScriptableUConv.h
intl/uconv/src/nsTextToSubURI.cpp
intl/uconv/src/nsTextToSubURI.h
intl/uconv/src/nsUConvModule.cpp
intl/uconv/src/nsUTF8ConverterService.cpp
intl/uconv/src/nsUTF8ConverterService.h
intl/uconv/src/nsUTF8ToUnicode.cpp
intl/uconv/src/nsUTF8ToUnicode.h
intl/uconv/src/nsUTF8ToUnicodeSSE2.cpp
intl/uconv/src/nsUnicodeToCP1252.cpp
intl/uconv/src/nsUnicodeToCP1252.h
intl/uconv/src/nsUnicodeToISO88591.cpp
intl/uconv/src/nsUnicodeToISO88591.h
intl/uconv/src/nsUnicodeToMacRoman.cpp
intl/uconv/src/nsUnicodeToMacRoman.h
intl/uconv/src/nsUnicodeToUTF8.cpp
intl/uconv/src/nsUnicodeToUTF8.h
netwerk/cookie/moz.build
--- a/intl/build/moz.build
+++ b/intl/build/moz.build
@@ -8,12 +8,12 @@ SOURCES += [
     'nsI18nModule.cpp',
 ]
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../locale',
     '../lwbrk',
     '../strres',
-    '../uconv/src',
+    '../uconv',
     '../unicharutil/src',
 ]
 
--- a/intl/locale/moz.build
+++ b/intl/locale/moz.build
@@ -48,15 +48,15 @@ EXTRA_JS_MODULES += [
     'PluralForm.jsm',
 ]
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '/intl/uconv/src',
+    '/intl/uconv',
 ]
 
 RESOURCE_FILES += [
     'langGroups.properties',
     'language.properties',
 ]
rename from intl/uconv/src/8859-1.uf
rename to intl/uconv/8859-1.uf
rename from intl/uconv/src/8859-1.ut
rename to intl/uconv/8859-1.ut
rename from intl/uconv/src/cp1252.uf
rename to intl/uconv/cp1252.uf
rename from intl/uconv/src/cp1252.ut
rename to intl/uconv/cp1252.ut
rename from intl/uconv/src/macroman.uf
rename to intl/uconv/macroman.uf
rename from intl/uconv/src/macroman.ut
rename to intl/uconv/macroman.ut
--- a/intl/uconv/moz.build
+++ b/intl/uconv/moz.build
@@ -8,13 +8,203 @@ DIRS += [
     'idl',
     'public',
     'ucvja',
     'ucvcn',
     'ucvlatin',
     'ucvtw',
     'ucvko',
     'ucvibm',
-    'src',
 ]
 
 TEST_TOOL_DIRS += ['tests']
 
+UNIFIED_SOURCES += [
+    'nsConverterInputStream.cpp',
+    'nsConverterOutputStream.cpp',
+    'nsCP1252ToUnicode.cpp',
+    'nsISO88591ToUnicode.cpp',
+    'nsMacRomanToUnicode.cpp',
+    'nsReplacementToUnicode.cpp',
+    'nsScriptableUConv.cpp',
+    'nsTextToSubURI.cpp',
+    'nsUConvModule.cpp',
+    'nsUnicodeToCP1252.cpp',
+    'nsUnicodeToISO88591.cpp',
+    'nsUnicodeToMacRoman.cpp',
+    'nsUnicodeToUTF8.cpp',
+    'nsUTF8ConverterService.cpp',
+    'nsUTF8ToUnicode.cpp',
+]
+
+UNIFIED_SOURCES += [
+    'ucvcn/nsGBKConvUtil.cpp',
+    'ucvcn/nsGBKToUnicode.cpp',
+    'ucvcn/nsHZToUnicode.cpp',
+    'ucvcn/nsUnicodeToGB2312V2.cpp',
+    'ucvcn/nsUnicodeToGBK.cpp',
+    'ucvcn/nsUnicodeToHZ.cpp',
+]
+
+UNIFIED_SOURCES += [
+    'ucvibm/nsCP850ToUnicode.cpp',
+    'ucvibm/nsCP852ToUnicode.cpp',
+    'ucvibm/nsCP855ToUnicode.cpp',
+    'ucvibm/nsCP857ToUnicode.cpp',
+    'ucvibm/nsCP862ToUnicode.cpp',
+    'ucvibm/nsCP864ToUnicode.cpp',
+    'ucvibm/nsUnicodeToCP850.cpp',
+    'ucvibm/nsUnicodeToCP852.cpp',
+    'ucvibm/nsUnicodeToCP855.cpp',
+    'ucvibm/nsUnicodeToCP857.cpp',
+    'ucvibm/nsUnicodeToCP862.cpp',
+    'ucvibm/nsUnicodeToCP864.cpp',
+]
+
+UNIFIED_SOURCES += [
+    'ucvja/nsJapaneseToUnicode.cpp',
+    'ucvja/nsUnicodeToEUCJP.cpp',
+    'ucvja/nsUnicodeToISO2022JP.cpp',
+    'ucvja/nsUnicodeToJISx0201.cpp',
+    'ucvja/nsUnicodeToSJIS.cpp',
+]
+
+UNIFIED_SOURCES += [
+    'ucvko/nsCP949ToUnicode.cpp',
+    'ucvko/nsUnicodeToCP949.cpp',
+]
+
+UNIFIED_SOURCES += [
+    'ucvlatin/nsARMSCII8ToUnicode.cpp',
+    'ucvlatin/nsAsciiToUnicode.cpp',
+    'ucvlatin/nsCP1250ToUnicode.cpp',
+    'ucvlatin/nsCP1251ToUnicode.cpp',
+    'ucvlatin/nsCP1253ToUnicode.cpp',
+    'ucvlatin/nsCP1254ToUnicode.cpp',
+    'ucvlatin/nsCP1255ToUnicode.cpp',
+    'ucvlatin/nsCP1256ToUnicode.cpp',
+    'ucvlatin/nsCP1257ToUnicode.cpp',
+    'ucvlatin/nsCP1258ToUnicode.cpp',
+    'ucvlatin/nsCP866ToUnicode.cpp',
+    'ucvlatin/nsCP874ToUnicode.cpp',
+    'ucvlatin/nsISO885910ToUnicode.cpp',
+    'ucvlatin/nsISO885911ToUnicode.cpp',
+    'ucvlatin/nsISO885913ToUnicode.cpp',
+    'ucvlatin/nsISO885914ToUnicode.cpp',
+    'ucvlatin/nsISO885915ToUnicode.cpp',
+    'ucvlatin/nsISO885916ToUnicode.cpp',
+    'ucvlatin/nsISO88592ToUnicode.cpp',
+    'ucvlatin/nsISO88593ToUnicode.cpp',
+    'ucvlatin/nsISO88594ToUnicode.cpp',
+    'ucvlatin/nsISO88595ToUnicode.cpp',
+    'ucvlatin/nsISO88596EToUnicode.cpp',
+    'ucvlatin/nsISO88596IToUnicode.cpp',
+    'ucvlatin/nsISO88596ToUnicode.cpp',
+    'ucvlatin/nsISO88597ToUnicode.cpp',
+    'ucvlatin/nsISO88598EToUnicode.cpp',
+    'ucvlatin/nsISO88598IToUnicode.cpp',
+    'ucvlatin/nsISO88598ToUnicode.cpp',
+    'ucvlatin/nsISO88599ToUnicode.cpp',
+    'ucvlatin/nsISOIR111ToUnicode.cpp',
+    'ucvlatin/nsKOI8RToUnicode.cpp',
+    'ucvlatin/nsKOI8UToUnicode.cpp',
+    'ucvlatin/nsMacArabicToUnicode.cpp',
+    'ucvlatin/nsMacCEToUnicode.cpp',
+    'ucvlatin/nsMacCroatianToUnicode.cpp',
+    'ucvlatin/nsMacCyrillicToUnicode.cpp',
+    'ucvlatin/nsMacDevanagariToUnicode.cpp',
+    'ucvlatin/nsMacFarsiToUnicode.cpp',
+    'ucvlatin/nsMacGreekToUnicode.cpp',
+    'ucvlatin/nsMacGujaratiToUnicode.cpp',
+    'ucvlatin/nsMacGurmukhiToUnicode.cpp',
+    'ucvlatin/nsMacHebrewToUnicode.cpp',
+    'ucvlatin/nsMacIcelandicToUnicode.cpp',
+    'ucvlatin/nsMacRomanianToUnicode.cpp',
+    'ucvlatin/nsMacTurkishToUnicode.cpp',
+    'ucvlatin/nsTIS620ToUnicode.cpp',
+    'ucvlatin/nsUnicodeToARMSCII8.cpp',
+    'ucvlatin/nsUnicodeToAscii.cpp',
+    'ucvlatin/nsUnicodeToCP1250.cpp',
+    'ucvlatin/nsUnicodeToCP1251.cpp',
+    'ucvlatin/nsUnicodeToCP1253.cpp',
+    'ucvlatin/nsUnicodeToCP1254.cpp',
+    'ucvlatin/nsUnicodeToCP1255.cpp',
+    'ucvlatin/nsUnicodeToCP1256.cpp',
+    'ucvlatin/nsUnicodeToCP1257.cpp',
+    'ucvlatin/nsUnicodeToCP1258.cpp',
+    'ucvlatin/nsUnicodeToCP866.cpp',
+    'ucvlatin/nsUnicodeToCP874.cpp',
+    'ucvlatin/nsUnicodeToISO885910.cpp',
+    'ucvlatin/nsUnicodeToISO885911.cpp',
+    'ucvlatin/nsUnicodeToISO885913.cpp',
+    'ucvlatin/nsUnicodeToISO885914.cpp',
+    'ucvlatin/nsUnicodeToISO885915.cpp',
+    'ucvlatin/nsUnicodeToISO885916.cpp',
+    'ucvlatin/nsUnicodeToISO88592.cpp',
+    'ucvlatin/nsUnicodeToISO88593.cpp',
+    'ucvlatin/nsUnicodeToISO88594.cpp',
+    'ucvlatin/nsUnicodeToISO88595.cpp',
+    'ucvlatin/nsUnicodeToISO88596.cpp',
+    'ucvlatin/nsUnicodeToISO88596E.cpp',
+    'ucvlatin/nsUnicodeToISO88596I.cpp',
+    'ucvlatin/nsUnicodeToISO88597.cpp',
+    'ucvlatin/nsUnicodeToISO88598.cpp',
+    'ucvlatin/nsUnicodeToISO88598E.cpp',
+    'ucvlatin/nsUnicodeToISO88598I.cpp',
+    'ucvlatin/nsUnicodeToISO88599.cpp',
+    'ucvlatin/nsUnicodeToISOIR111.cpp',
+    'ucvlatin/nsUnicodeToKOI8R.cpp',
+    'ucvlatin/nsUnicodeToKOI8U.cpp',
+    'ucvlatin/nsUnicodeToMacArabic.cpp',
+    'ucvlatin/nsUnicodeToMacCE.cpp',
+    'ucvlatin/nsUnicodeToMacCroatian.cpp',
+    'ucvlatin/nsUnicodeToMacCyrillic.cpp',
+    'ucvlatin/nsUnicodeToMacDevanagari.cpp',
+    'ucvlatin/nsUnicodeToMacFarsi.cpp',
+    'ucvlatin/nsUnicodeToMacGreek.cpp',
+    'ucvlatin/nsUnicodeToMacGujarati.cpp',
+    'ucvlatin/nsUnicodeToMacGurmukhi.cpp',
+    'ucvlatin/nsUnicodeToMacHebrew.cpp',
+    'ucvlatin/nsUnicodeToMacIcelandic.cpp',
+    'ucvlatin/nsUnicodeToMacRomanian.cpp',
+    'ucvlatin/nsUnicodeToMacTurkish.cpp',
+    'ucvlatin/nsUnicodeToTIS620.cpp',
+    'ucvlatin/nsUnicodeToUserDefined.cpp',
+    'ucvlatin/nsUnicodeToUTF16.cpp',
+    'ucvlatin/nsUserDefinedToUnicode.cpp',
+    'ucvlatin/nsUTF16ToUnicode.cpp',
+]
+
+UNIFIED_SOURCES += [
+    'ucvtw/nsBIG5HKSCSToUnicode.cpp',
+    'ucvtw/nsBIG5ToUnicode.cpp',
+    'ucvtw/nsUnicodeToBIG5.cpp',
+    'ucvtw/nsUnicodeToBIG5HKSCS.cpp',
+    'ucvtw/nsUnicodeToHKSCS.cpp',
+]
+
+UNIFIED_SOURCES += [
+    'util/nsUCConstructors.cpp',
+    'util/nsUCSupport.cpp',
+    'util/nsUnicodeDecodeHelper.cpp',
+    'util/nsUnicodeEncodeHelper.cpp',
+    'util/ugen.c',
+    'util/umap.c',
+    'util/uscan.c',
+]
+
+if CONFIG['INTEL_ARCHITECTURE']:
+    SOURCES += ['nsUTF8ToUnicodeSSE2.cpp']
+    SOURCES['nsUTF8ToUnicodeSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+
+MSVC_ENABLE_PGO = True
+
+LOCAL_INCLUDES += [
+    'ucvcn',
+    'ucvibm',
+    'ucvja',
+    'ucvko',
+    'ucvlatin',
+    'ucvtw',
+    'util',
+]
+
+FINAL_LIBRARY = 'xul'
rename from intl/uconv/src/nsCP1252ToUnicode.cpp
rename to intl/uconv/nsCP1252ToUnicode.cpp
rename from intl/uconv/src/nsCP1252ToUnicode.h
rename to intl/uconv/nsCP1252ToUnicode.h
rename from intl/uconv/src/nsConverterInputStream.cpp
rename to intl/uconv/nsConverterInputStream.cpp
rename from intl/uconv/src/nsConverterInputStream.h
rename to intl/uconv/nsConverterInputStream.h
rename from intl/uconv/src/nsConverterOutputStream.cpp
rename to intl/uconv/nsConverterOutputStream.cpp
rename from intl/uconv/src/nsConverterOutputStream.h
rename to intl/uconv/nsConverterOutputStream.h
rename from intl/uconv/src/nsISO88591ToUnicode.cpp
rename to intl/uconv/nsISO88591ToUnicode.cpp
rename from intl/uconv/src/nsISO88591ToUnicode.h
rename to intl/uconv/nsISO88591ToUnicode.h
rename from intl/uconv/src/nsMacRomanToUnicode.cpp
rename to intl/uconv/nsMacRomanToUnicode.cpp
rename from intl/uconv/src/nsMacRomanToUnicode.h
rename to intl/uconv/nsMacRomanToUnicode.h
rename from intl/uconv/src/nsReplacementToUnicode.cpp
rename to intl/uconv/nsReplacementToUnicode.cpp
rename from intl/uconv/src/nsReplacementToUnicode.h
rename to intl/uconv/nsReplacementToUnicode.h
rename from intl/uconv/src/nsScriptableUConv.cpp
rename to intl/uconv/nsScriptableUConv.cpp
rename from intl/uconv/src/nsScriptableUConv.h
rename to intl/uconv/nsScriptableUConv.h
rename from intl/uconv/src/nsTextToSubURI.cpp
rename to intl/uconv/nsTextToSubURI.cpp
rename from intl/uconv/src/nsTextToSubURI.h
rename to intl/uconv/nsTextToSubURI.h
rename from intl/uconv/src/nsUConvModule.cpp
rename to intl/uconv/nsUConvModule.cpp
rename from intl/uconv/src/nsUTF8ConverterService.cpp
rename to intl/uconv/nsUTF8ConverterService.cpp
rename from intl/uconv/src/nsUTF8ConverterService.h
rename to intl/uconv/nsUTF8ConverterService.h
rename from intl/uconv/src/nsUTF8ToUnicode.cpp
rename to intl/uconv/nsUTF8ToUnicode.cpp
rename from intl/uconv/src/nsUTF8ToUnicode.h
rename to intl/uconv/nsUTF8ToUnicode.h
rename from intl/uconv/src/nsUTF8ToUnicodeSSE2.cpp
rename to intl/uconv/nsUTF8ToUnicodeSSE2.cpp
rename from intl/uconv/src/nsUnicodeToCP1252.cpp
rename to intl/uconv/nsUnicodeToCP1252.cpp
rename from intl/uconv/src/nsUnicodeToCP1252.h
rename to intl/uconv/nsUnicodeToCP1252.h
rename from intl/uconv/src/nsUnicodeToISO88591.cpp
rename to intl/uconv/nsUnicodeToISO88591.cpp
rename from intl/uconv/src/nsUnicodeToISO88591.h
rename to intl/uconv/nsUnicodeToISO88591.h
rename from intl/uconv/src/nsUnicodeToMacRoman.cpp
rename to intl/uconv/nsUnicodeToMacRoman.cpp
rename from intl/uconv/src/nsUnicodeToMacRoman.h
rename to intl/uconv/nsUnicodeToMacRoman.h
rename from intl/uconv/src/nsUnicodeToUTF8.cpp
rename to intl/uconv/nsUnicodeToUTF8.cpp
rename from intl/uconv/src/nsUnicodeToUTF8.h
rename to intl/uconv/nsUnicodeToUTF8.h
deleted file mode 100644
--- a/intl/uconv/src/moz.build
+++ /dev/null
@@ -1,198 +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/.
-
-UNIFIED_SOURCES += [
-    'nsConverterInputStream.cpp',
-    'nsConverterOutputStream.cpp',
-    'nsCP1252ToUnicode.cpp',
-    'nsISO88591ToUnicode.cpp',
-    'nsMacRomanToUnicode.cpp',
-    'nsReplacementToUnicode.cpp',
-    'nsScriptableUConv.cpp',
-    'nsTextToSubURI.cpp',
-    'nsUConvModule.cpp',
-    'nsUnicodeToCP1252.cpp',
-    'nsUnicodeToISO88591.cpp',
-    'nsUnicodeToMacRoman.cpp',
-    'nsUnicodeToUTF8.cpp',
-    'nsUTF8ConverterService.cpp',
-    'nsUTF8ToUnicode.cpp',
-]
-
-UNIFIED_SOURCES += [
-    '../ucvcn/nsGBKConvUtil.cpp',
-    '../ucvcn/nsGBKToUnicode.cpp',
-    '../ucvcn/nsHZToUnicode.cpp',
-    '../ucvcn/nsUnicodeToGB2312V2.cpp',
-    '../ucvcn/nsUnicodeToGBK.cpp',
-    '../ucvcn/nsUnicodeToHZ.cpp',
-]
-
-UNIFIED_SOURCES += [
-    '../ucvibm/nsCP850ToUnicode.cpp',
-    '../ucvibm/nsCP852ToUnicode.cpp',
-    '../ucvibm/nsCP855ToUnicode.cpp',
-    '../ucvibm/nsCP857ToUnicode.cpp',
-    '../ucvibm/nsCP862ToUnicode.cpp',
-    '../ucvibm/nsCP864ToUnicode.cpp',
-    '../ucvibm/nsUnicodeToCP850.cpp',
-    '../ucvibm/nsUnicodeToCP852.cpp',
-    '../ucvibm/nsUnicodeToCP855.cpp',
-    '../ucvibm/nsUnicodeToCP857.cpp',
-    '../ucvibm/nsUnicodeToCP862.cpp',
-    '../ucvibm/nsUnicodeToCP864.cpp',
-]
-
-UNIFIED_SOURCES += [
-    '../ucvja/nsJapaneseToUnicode.cpp',
-    '../ucvja/nsUnicodeToEUCJP.cpp',
-    '../ucvja/nsUnicodeToISO2022JP.cpp',
-    '../ucvja/nsUnicodeToJISx0201.cpp',
-    '../ucvja/nsUnicodeToSJIS.cpp',
-]
-
-UNIFIED_SOURCES += [
-    '../ucvko/nsCP949ToUnicode.cpp',
-    '../ucvko/nsUnicodeToCP949.cpp',
-]
-
-UNIFIED_SOURCES += [
-    '../ucvlatin/nsARMSCII8ToUnicode.cpp',
-    '../ucvlatin/nsAsciiToUnicode.cpp',
-    '../ucvlatin/nsCP1250ToUnicode.cpp',
-    '../ucvlatin/nsCP1251ToUnicode.cpp',
-    '../ucvlatin/nsCP1253ToUnicode.cpp',
-    '../ucvlatin/nsCP1254ToUnicode.cpp',
-    '../ucvlatin/nsCP1255ToUnicode.cpp',
-    '../ucvlatin/nsCP1256ToUnicode.cpp',
-    '../ucvlatin/nsCP1257ToUnicode.cpp',
-    '../ucvlatin/nsCP1258ToUnicode.cpp',
-    '../ucvlatin/nsCP866ToUnicode.cpp',
-    '../ucvlatin/nsCP874ToUnicode.cpp',
-    '../ucvlatin/nsISO885910ToUnicode.cpp',
-    '../ucvlatin/nsISO885911ToUnicode.cpp',
-    '../ucvlatin/nsISO885913ToUnicode.cpp',
-    '../ucvlatin/nsISO885914ToUnicode.cpp',
-    '../ucvlatin/nsISO885915ToUnicode.cpp',
-    '../ucvlatin/nsISO885916ToUnicode.cpp',
-    '../ucvlatin/nsISO88592ToUnicode.cpp',
-    '../ucvlatin/nsISO88593ToUnicode.cpp',
-    '../ucvlatin/nsISO88594ToUnicode.cpp',
-    '../ucvlatin/nsISO88595ToUnicode.cpp',
-    '../ucvlatin/nsISO88596EToUnicode.cpp',
-    '../ucvlatin/nsISO88596IToUnicode.cpp',
-    '../ucvlatin/nsISO88596ToUnicode.cpp',
-    '../ucvlatin/nsISO88597ToUnicode.cpp',
-    '../ucvlatin/nsISO88598EToUnicode.cpp',
-    '../ucvlatin/nsISO88598IToUnicode.cpp',
-    '../ucvlatin/nsISO88598ToUnicode.cpp',
-    '../ucvlatin/nsISO88599ToUnicode.cpp',
-    '../ucvlatin/nsISOIR111ToUnicode.cpp',
-    '../ucvlatin/nsKOI8RToUnicode.cpp',
-    '../ucvlatin/nsKOI8UToUnicode.cpp',
-    '../ucvlatin/nsMacArabicToUnicode.cpp',
-    '../ucvlatin/nsMacCEToUnicode.cpp',
-    '../ucvlatin/nsMacCroatianToUnicode.cpp',
-    '../ucvlatin/nsMacCyrillicToUnicode.cpp',
-    '../ucvlatin/nsMacDevanagariToUnicode.cpp',
-    '../ucvlatin/nsMacFarsiToUnicode.cpp',
-    '../ucvlatin/nsMacGreekToUnicode.cpp',
-    '../ucvlatin/nsMacGujaratiToUnicode.cpp',
-    '../ucvlatin/nsMacGurmukhiToUnicode.cpp',
-    '../ucvlatin/nsMacHebrewToUnicode.cpp',
-    '../ucvlatin/nsMacIcelandicToUnicode.cpp',
-    '../ucvlatin/nsMacRomanianToUnicode.cpp',
-    '../ucvlatin/nsMacTurkishToUnicode.cpp',
-    '../ucvlatin/nsTIS620ToUnicode.cpp',
-    '../ucvlatin/nsUnicodeToARMSCII8.cpp',
-    '../ucvlatin/nsUnicodeToAscii.cpp',
-    '../ucvlatin/nsUnicodeToCP1250.cpp',
-    '../ucvlatin/nsUnicodeToCP1251.cpp',
-    '../ucvlatin/nsUnicodeToCP1253.cpp',
-    '../ucvlatin/nsUnicodeToCP1254.cpp',
-    '../ucvlatin/nsUnicodeToCP1255.cpp',
-    '../ucvlatin/nsUnicodeToCP1256.cpp',
-    '../ucvlatin/nsUnicodeToCP1257.cpp',
-    '../ucvlatin/nsUnicodeToCP1258.cpp',
-    '../ucvlatin/nsUnicodeToCP866.cpp',
-    '../ucvlatin/nsUnicodeToCP874.cpp',
-    '../ucvlatin/nsUnicodeToISO885910.cpp',
-    '../ucvlatin/nsUnicodeToISO885911.cpp',
-    '../ucvlatin/nsUnicodeToISO885913.cpp',
-    '../ucvlatin/nsUnicodeToISO885914.cpp',
-    '../ucvlatin/nsUnicodeToISO885915.cpp',
-    '../ucvlatin/nsUnicodeToISO885916.cpp',
-    '../ucvlatin/nsUnicodeToISO88592.cpp',
-    '../ucvlatin/nsUnicodeToISO88593.cpp',
-    '../ucvlatin/nsUnicodeToISO88594.cpp',
-    '../ucvlatin/nsUnicodeToISO88595.cpp',
-    '../ucvlatin/nsUnicodeToISO88596.cpp',
-    '../ucvlatin/nsUnicodeToISO88596E.cpp',
-    '../ucvlatin/nsUnicodeToISO88596I.cpp',
-    '../ucvlatin/nsUnicodeToISO88597.cpp',
-    '../ucvlatin/nsUnicodeToISO88598.cpp',
-    '../ucvlatin/nsUnicodeToISO88598E.cpp',
-    '../ucvlatin/nsUnicodeToISO88598I.cpp',
-    '../ucvlatin/nsUnicodeToISO88599.cpp',
-    '../ucvlatin/nsUnicodeToISOIR111.cpp',
-    '../ucvlatin/nsUnicodeToKOI8R.cpp',
-    '../ucvlatin/nsUnicodeToKOI8U.cpp',
-    '../ucvlatin/nsUnicodeToMacArabic.cpp',
-    '../ucvlatin/nsUnicodeToMacCE.cpp',
-    '../ucvlatin/nsUnicodeToMacCroatian.cpp',
-    '../ucvlatin/nsUnicodeToMacCyrillic.cpp',
-    '../ucvlatin/nsUnicodeToMacDevanagari.cpp',
-    '../ucvlatin/nsUnicodeToMacFarsi.cpp',
-    '../ucvlatin/nsUnicodeToMacGreek.cpp',
-    '../ucvlatin/nsUnicodeToMacGujarati.cpp',
-    '../ucvlatin/nsUnicodeToMacGurmukhi.cpp',
-    '../ucvlatin/nsUnicodeToMacHebrew.cpp',
-    '../ucvlatin/nsUnicodeToMacIcelandic.cpp',
-    '../ucvlatin/nsUnicodeToMacRomanian.cpp',
-    '../ucvlatin/nsUnicodeToMacTurkish.cpp',
-    '../ucvlatin/nsUnicodeToTIS620.cpp',
-    '../ucvlatin/nsUnicodeToUserDefined.cpp',
-    '../ucvlatin/nsUnicodeToUTF16.cpp',
-    '../ucvlatin/nsUserDefinedToUnicode.cpp',
-    '../ucvlatin/nsUTF16ToUnicode.cpp',
-]
-
-UNIFIED_SOURCES += [
-    '../ucvtw/nsBIG5HKSCSToUnicode.cpp',
-    '../ucvtw/nsBIG5ToUnicode.cpp',
-    '../ucvtw/nsUnicodeToBIG5.cpp',
-    '../ucvtw/nsUnicodeToBIG5HKSCS.cpp',
-    '../ucvtw/nsUnicodeToHKSCS.cpp',
-]
-
-UNIFIED_SOURCES += [
-    '../util/nsUCConstructors.cpp',
-    '../util/nsUCSupport.cpp',
-    '../util/nsUnicodeDecodeHelper.cpp',
-    '../util/nsUnicodeEncodeHelper.cpp',
-    '../util/ugen.c',
-    '../util/umap.c',
-    '../util/uscan.c',
-]
-
-if CONFIG['INTEL_ARCHITECTURE']:
-    SOURCES += ['nsUTF8ToUnicodeSSE2.cpp']
-    SOURCES['nsUTF8ToUnicodeSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-
-MSVC_ENABLE_PGO = True
-
-LOCAL_INCLUDES += [
-    '../ucvcn',
-    '../ucvibm',
-    '../ucvja',
-    '../ucvko',
-    '../ucvlatin',
-    '../ucvtw',
-    '../util',
-]
-
-FINAL_LIBRARY = 'xul'
-
--- a/netwerk/cookie/moz.build
+++ b/netwerk/cookie/moz.build
@@ -28,17 +28,17 @@ if CONFIG['NECKO_COOKIES']:
         'CookieServiceParent.cpp',
         'nsCookie.cpp',
     ]
     # nsCookieService.cpp can't be unified because it forces NSPR logging.
     SOURCES += [
         'nsCookieService.cpp',
     ]
     LOCAL_INCLUDES += [
-        '/intl/uconv/src',
+        '/intl/uconv',
     ]
 
     XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
 
     # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
     if CONFIG['OS_ARCH'] != 'Darwin':
         XPCSHELL_TESTS_MANIFESTS += ['test/unit_ipc/xpcshell.ini']