Merge "Add C.utf8 to supported locales"

am: 158f2d9eaf

Change-Id: Id26c2b0ecff79432389e6238783022273efbb557
This commit is contained in:
Aaron Kling 2018-08-21 18:27:09 -07:00 committed by android-build-merger
commit 9a3368466c
1 changed files with 3 additions and 0 deletions

View File

@ -293,6 +293,9 @@ func (c *configImpl) configureLocale(ctx Context) {
// for others)
if inList("C.UTF-8", locales) {
c.environ.Set("LANG", "C.UTF-8")
} else if inList("C.utf8", locales) {
// These normalize to the same thing
c.environ.Set("LANG", "C.UTF-8")
} else if inList("en_US.UTF-8", locales) {
c.environ.Set("LANG", "en_US.UTF-8")
} else if inList("en_US.utf8", locales) {