From a1fbf282fede02ed3038ace5eb90e4ab086dbef9 Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Wed, 1 Feb 2017 14:52:10 +0000 Subject: [PATCH] Add Proxy, Executable, InvocationHandler, Enum members to openjdk.pro, getProtectionDomain to vm.pro --- openjdk.pro | 20 ++++++++++++++++++++ vm.pro | 4 ++++ 2 files changed, 24 insertions(+) diff --git a/openjdk.pro b/openjdk.pro index 14bb9f91f8..2393930fff 100644 --- a/openjdk.pro +++ b/openjdk.pro @@ -312,3 +312,23 @@ *** match; *** next; } + +# These classes are accessed via bytecode generated on the fly. +-keepclassmembers class java.lang.reflect.Proxy { + ; +} + +-keepclassmembers class java.lang.reflect.InvocationHandler { + ; +} + +# Don't strip special enum members. +-keepclassmembers,allowoptimization enum * { + public static **[] values(); + public static ** valueOf(java.lang.String); +} + +-keepclassmembers class java.lang.reflect.Executable { + ; +} + diff --git a/vm.pro b/vm.pro index 0eee875cfe..ebc6f7c7e0 100644 --- a/vm.pro +++ b/vm.pro @@ -129,3 +129,7 @@ -keepclassmembers class java.lang.ClassLoader { public java.lang.Class loadClass(java.lang.String); } + + -keepclassmembers class avian.Classes { + public java.security.ProtectionDomain getProtectionDomain(avian.VMClass); + }