Update the package whitelist for the boot image.
.. to track the inclusion of OpenJdk.
(cherry picked from commit b3c9e4a22ee6d32a99a5c9a7b833e2644a690c82)
Change-Id: Ie7277a0403dee9ccd114d9dcb7bf95cdaf5688a0
diff --git a/core/tasks/check_boot_jars/package_whitelist.txt b/core/tasks/check_boot_jars/package_whitelist.txt
index 4d62615..48fa4a1 100644
--- a/core/tasks/check_boot_jars/package_whitelist.txt
+++ b/core/tasks/check_boot_jars/package_whitelist.txt
@@ -2,7 +2,7 @@
# Each line is interpreted as a regular expression.
###################################################
-# core-libart.jar
+# core-libart.jar & core-oj.jar
java\.awt\.font
java\.beans
java\.io
@@ -13,6 +13,9 @@
java\.math
java\.net
java\.nio
+java\.nio\.file
+java\.nio\.file\.spi
+java\.nio\.file\.attribute
java\.nio\.channels
java\.nio\.channels\.spi
java\.nio\.charset
@@ -24,6 +27,7 @@
java\.security\.spec
java\.sql
java\.text
+java\.text\.spi
java\.util
java\.util\.concurrent
java\.util\.concurrent\.atomic
@@ -32,6 +36,7 @@
java\.util\.logging
java\.util\.prefs
java\.util\.regex
+java\.util\.spi
java\.util\.zip
javax\.crypto
javax\.crypto\.interfaces
@@ -54,10 +59,18 @@
javax\.xml\.transform\.stream
javax\.xml\.validation
javax\.xml\.xpath
-sun\.misc
org\.w3c\.dom
org\.w3c\.dom\.ls
org\.w3c\.dom\.traversal
+# OpenJdk internal implementation.
+sun\.misc
+sun\.util.*
+sun\.text.*
+sun\.security.*
+sun\.reflect.*
+sun\.nio.*
+sun\.net.*
+com\.sun\..*
# TODO: Move these internal org.apache.harmony classes to libcore.*
org\.apache\.harmony\.crypto\.internal
