Merge "Add CollationRoot to preloaded classes" into oc-mr1-dev (95856801) · Commits · e / os / android_frameworks_base

config/generate-preloaded-classes.sh

+7 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,10 @@ if [ "$#" -lt 2 ]; then
		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 @@ echo "# Preloaded-classes filter file for phones.
		#
		# 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

+2 −3

Original line number	Diff line number	Diff line
		@@ -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$Sink
		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
		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.SparseLongArray
		android.util.StateSet
		android.util.SuperNotCalledException
		android.util.TimeUtils
		android.util.TimingsTraceLog
		android.util.TypedValue
		android.util.Xml
		android.util.jar.StrictJarFile

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		android.icu.impl.coll.CollationRoot