BaseTools/UniClassObject: Support UTF-8 string data in .uni files

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / UniClassObject.py

diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py
index d0cbb1d0bb20905a44ff37c4c2ab81ad77d8c96c..02a15cc0f0d4cd3877d5b6c54d85860b4d13ffba 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/UniClassObject.py
+++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py
@@ -297,9 +297,12 @@ class UniFileClassObject(object):
             EdkLogger.Error("build", FILE_OPEN_FAILURE, ExtraData=File)\r
 \r
         #\r
-        # We currently only support UTF-16\r
+        # Detect Byte Order Mark at beginning of file.  Default to UTF-8\r
         #\r
-        Encoding = 'utf-16'\r
+        Encoding = 'utf-8'\r
+        if (FileIn.startswith(codecs.BOM_UTF16_BE) or\r
+            FileIn.startswith(codecs.BOM_UTF16_LE)):\r
+            Encoding = 'utf-16'\r
 \r
         self.VerifyUcs2Data(FileIn, FileName, Encoding)\r
 \r