commit b927c559e1ef8530b08712507f320502627db298
author Roozbeh Pournader <roozbeh@google.com> Fri Jan 15 11:23:42 2016 -0800
committer Roozbeh Pournader <roozbeh@google.com> Thu Jan 21 13:47:22 2016 -0800
tree f0d2fd051cb4486239e6f6187e0da53e416fdaeb
parent ac3e599069e1b87ea190f008aef60a506c8561c7

Implement smarter locale resource selection

* Add support for determining script from language and region.
* Add support for determining special parents of locales.
* Add support for smart comparison of locales with only a difference
  in region, using the locale parentage tree.
* Fix LocaleData.matchScore() to not fallback to old locale matching
  behavior if we can't determine a script.
* Allow four-character variant codes. (Previously, only five- to
  eight-character variant codes were allowed.)

Bug: 7296673
Bug: 26589793
Change-Id: Ibde0a48c0564ff383b41068095a5cbacfe7b94bc

libs/androidfw/Android.mk

diff --git a/libs/androidfw/Android.mk b/libs/androidfw/Android.mk
index f682fb8..e6d1496 100644
--- a/libs/androidfw/Android.mk
+++ b/libs/androidfw/Android.mk
@@ -21,6 +21,7 @@
     Asset.cpp \
     AssetDir.cpp \
     AssetManager.cpp \
+    LocaleData.cpp \
     misc.cpp \
     ObbFile.cpp \
     ResourceTypes.cpp \