diff options
| author | Narayan Kamath <narayan@google.com> | 2015-11-17 18:34:53 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-12-24 10:10:55 +0000 |
| commit | 436d0c11175692c9c05f2d47e8b5b2c052525a6b (patch) | |
| tree | d80b436597f1bc10efffda33f18209633a543ce5 | |
| parent | 052a00f64e82b524fcb4320897b46dc941670a22 (diff) | |
| download | build-436d0c11175692c9c05f2d47e8b5b2c052525a6b.tar.gz | |
Update the package whitelist for the boot image.
.. to track the inclusion of OpenJdk.
(cherry picked from commit b3c9e4a22ee6d32a99a5c9a7b833e2644a690c82)
Change-Id: Ie7277a0403dee9ccd114d9dcb7bf95cdaf5688a0
| -rw-r--r-- | core/tasks/check_boot_jars/package_whitelist.txt | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/core/tasks/check_boot_jars/package_whitelist.txt b/core/tasks/check_boot_jars/package_whitelist.txt index 4d6261572e..48fa4a181a 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\.lang\.reflect 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\.interfaces 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\.jar 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\.sax 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 |