Update ICU to 54.1 step 1

source/common/ucnv_bld.cpp

Index: source/common/ucnv_bld.cpp
diff --git a/source/common/ucnv_bld.cpp b/source/common/ucnv_bld.cpp
index 047f18a83cf15ec9a5c93f73f0bf9e9d4b16f048..4940310f1f671287da4a2452641ba867c2e59e3f 100644
--- a/source/common/ucnv_bld.cpp
+++ b/source/common/ucnv_bld.cpp
@@ -69,41 +69,28 @@ converterData[UCNV_NUMBER_OF_SUPPORTED_CONVERTER_TYPES]={
 
 #if UCONFIG_NO_LEGACY_CONVERSION
     NULL,
-#else
-    &_ISO2022Data,
-#endif
-
-#if UCONFIG_NO_LEGACY_CONVERSION || UCONFIG_NO_NON_HTML5_CONVERSION
     NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL, NULL, NULL,
     NULL,
 #else
+    &_ISO2022Data,
     &_LMBCSData1,&_LMBCSData2, &_LMBCSData3, &_LMBCSData4, &_LMBCSData5, &_LMBCSData6,
     &_LMBCSData8,&_LMBCSData11,&_LMBCSData16,&_LMBCSData17,&_LMBCSData18,&_LMBCSData19,
     &_HZData,
 #endif
 
-#if UCONFIG_NO_NON_HTML5_CONVERSION
-    NULL,
-#else
     &_SCSUData,
-#endif
-
 
-#if UCONFIG_NO_LEGACY_CONVERSION || UCONFIG_NO_NON_HTML5_CONVERSION
+#if UCONFIG_NO_LEGACY_CONVERSION
     NULL,
 #else
     &_ISCIIData,
 #endif
 
     &_ASCIIData,
-#if UCONFIG_NO_NON_HTML5_CONVERSION
-    NULL, NULL, &_UTF16Data, &_UTF32Data, NULL, NULL,
-#else
     &_UTF7Data, &_Bocu1Data, &_UTF16Data, &_UTF32Data, &_CESU8Data, &_IMAPData,
-#endif
 
-#if UCONFIG_NO_LEGACY_CONVERSION || UCONFIG_NO_NON_HTML5_CONVERSION
+#if UCONFIG_NO_LEGACY_CONVERSION
     NULL,
 #else
     &_CompoundTextData
@@ -118,24 +105,18 @@ static struct {
   const char *name;
   const UConverterType type;
 } const cnvNameType[] = {
-#if !UCONFIG_NO_NON_HTML5_CONVERSION
   { "bocu1", UCNV_BOCU1 },
   { "cesu8", UCNV_CESU8 },
-#endif
-#if !UCONFIG_NO_LEGACY_CONVERSION && !UCONFIG_NO_NON_HTML5_CONVERSION
+#if !UCONFIG_NO_LEGACY_CONVERSION
   { "hz",UCNV_HZ },
 #endif
-#if !UCONFIG_NO_NON_HTML5_CONVERSION
   { "imapmailboxname", UCNV_IMAP_MAILBOX },
-#endif
-#if !UCONFIG_NO_LEGACY_CONVERSION && !UCONFIG_NO_NON_HTML5_CONVERSION
-  { "iscii", UCNV_ISCII },
-#endif
 #if !UCONFIG_NO_LEGACY_CONVERSION
+  { "iscii", UCNV_ISCII },
   { "iso2022", UCNV_ISO_2022 },
 #endif
   { "iso88591", UCNV_LATIN_1 },
-#if !UCONFIG_NO_LEGACY_CONVERSION && !UCONFIG_NO_NON_HTML5_CONVERSION
+#if !UCONFIG_NO_LEGACY_CONVERSION
   { "lmbcs1", UCNV_LMBCS_1 },
   { "lmbcs11",UCNV_LMBCS_11 },
   { "lmbcs16",UCNV_LMBCS_16 },
@@ -149,9 +130,7 @@ static struct {
   { "lmbcs6", UCNV_LMBCS_6 },
   { "lmbcs8", UCNV_LMBCS_8 },
 #endif
-#if !UCONFIG_NO_NON_HTML5_CONVERSION
   { "scsu", UCNV_SCSU },
-#endif
   { "usascii", UCNV_US_ASCII },
   { "utf16", UCNV_UTF16 },
   { "utf16be", UCNV_UTF16_BigEndian },
@@ -173,13 +152,9 @@ static struct {
   { "utf32oppositeendian", UCNV_UTF32_BigEndian },
   { "utf32platformendian", UCNV_UTF32_LittleEndian },
 #endif
-#if !UCONFIG_NO_NON_HTML5_CONVERSION
   { "utf7", UCNV_UTF7 },
-#endif
   { "utf8", UCNV_UTF8 },
-#if !UCONFIG_NO_NON_HTML5_CONVERSION
   { "x11compoundtext", UCNV_COMPOUND_TEXT}
-#endif
 };