Add CollationRoot to preloaded classes
It was determined this would save RAM.
Test: ./generate-preloaded-classes.sh base.txt preloaded-classes-blacklist preloaded-classes-extra > preloaded-classes
Test: Look at the generated file
Bug: 63444758
Change-Id: Ib49b1218e94e4a4a2211071da189cf917559248b
diff --git a/config/generate-preloaded-classes.sh b/config/generate-preloaded-classes.sh
index d55190b..e36e148 100755
--- a/config/generate-preloaded-classes.sh
+++ b/config/generate-preloaded-classes.sh
@@ -17,6 +17,10 @@
echo "Usage $0 <input classes file> <blacklist file> [extra classes files]"
exit 1
fi
+
+# Write file headers first
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cat "$DIR/copyright-header"
echo "# Preloaded-classes filter file for phones.
#
# Classes in this file will be allocated into the boot image, and forcibly initialized in
@@ -25,9 +29,11 @@
#
# This file has been derived for mainline phone (and tablet) usage.
#"
+
input=$1
blacklist=$2
shift 2
extra_classes_files=("$@")
-sort "$input" "${extra_classes_files[@]}" | uniq | grep -f "$blacklist" -v -F -x
+# Disable locale to enable lexicographical sorting
+LC_ALL=C sort "$input" "${extra_classes_files[@]}" | uniq | grep -f "$blacklist" -v -F -x
diff --git a/config/preloaded-classes b/config/preloaded-classes
index b6be0ee..1c842c7 100644
--- a/config/preloaded-classes
+++ b/config/preloaded-classes
@@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-#
-#
# Preloaded-classes filter file for phones.
#
# Classes in this file will be allocated into the boot image, and forcibly initialized in
@@ -1454,6 +1452,7 @@
android.icu.impl.UResource$Table
android.icu.impl.UResource$Value
android.icu.impl.Utility
+android.icu.impl.coll.CollationRoot
android.icu.impl.locale.AsciiUtil
android.icu.impl.locale.BaseLocale
android.icu.impl.locale.BaseLocale$Cache
@@ -2276,7 +2275,6 @@
android.util.Base64$Coder
android.util.Base64$Decoder
android.util.Base64$Encoder
-android.util.TimingsTraceLog
android.util.ContainerHelpers
android.util.DisplayMetrics
android.util.EventLog
@@ -2328,6 +2326,7 @@
android.util.StateSet
android.util.SuperNotCalledException
android.util.TimeUtils
+android.util.TimingsTraceLog
android.util.TypedValue
android.util.Xml
android.util.jar.StrictJarFile
diff --git a/config/preloaded-classes-extra b/config/preloaded-classes-extra
new file mode 100644
index 0000000..1934cbc
--- /dev/null
+++ b/config/preloaded-classes-extra
@@ -0,0 +1 @@
+android.icu.impl.coll.CollationRoot