From a60dafaf4fb0870b4b7a86ee279db298154b9ac7 Mon Sep 17 00:00:00 2001
From: Joel Dice <git@seibutsu.mailsnare.net>
Date: Sun, 20 Jan 2008 15:00:19 -0700
Subject: [PATCH] only non-static fields need be preserved in bootstrap classes

---
 vm.pro | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/vm.pro b/vm.pro
index c6a16c7808..449c36176a 100644
--- a/vm.pro
+++ b/vm.pro
@@ -8,27 +8,27 @@
 
 # the VM depends on the fixed layout of the following classes:
 
--keepclassmembers class java.lang.Class { <fields>; }
--keepclassmembers class java.lang.ClassLoader { <fields>; }
--keepclassmembers class java.lang.SystemClassLoader { <fields>; }
--keepclassmembers class java.lang.String { <fields>; }
--keepclassmembers class java.lang.Thread { <fields>; }
--keepclassmembers class java.lang.StackTraceElement { <fields>; }
--keepclassmembers class java.lang.Throwable { <fields>; }
--keepclassmembers class java.lang.Byte { <fields>; }
--keepclassmembers class java.lang.Boolean { <fields>; }
--keepclassmembers class java.lang.Short { <fields>; }
--keepclassmembers class java.lang.Character { <fields>; }
--keepclassmembers class java.lang.Integer { <fields>; }
--keepclassmembers class java.lang.Long { <fields>; }
--keepclassmembers class java.lang.Float { <fields>; }
--keepclassmembers class java.lang.Double { <fields>; }
--keepclassmembers class java.lang.ref.Reference { <fields>; }
--keepclassmembers class java.lang.ref.ReferenceQueue { <fields>; }
--keepclassmembers class java.lang.ref.WeakReference { <fields>; }
--keepclassmembers class java.lang.ref.PhantomReference { <fields>; }
--keepclassmembers class java.lang.reflect.Field { <fields>; }
--keepclassmembers class java.lang.reflect.Method { <fields>; }
+-keepclassmembers class java.lang.Class { !static <fields>; }
+-keepclassmembers class java.lang.ClassLoader { !static <fields>; }
+-keepclassmembers class java.lang.SystemClassLoader { !static <fields>; }
+-keepclassmembers class java.lang.String { !static <fields>; }
+-keepclassmembers class java.lang.Thread { !static <fields>; }
+-keepclassmembers class java.lang.StackTraceElement { !static <fields>; }
+-keepclassmembers class java.lang.Throwable { !static <fields>; }
+-keepclassmembers class java.lang.Byte { !static <fields>; }
+-keepclassmembers class java.lang.Boolean { !static <fields>; }
+-keepclassmembers class java.lang.Short { !static <fields>; }
+-keepclassmembers class java.lang.Character { !static <fields>; }
+-keepclassmembers class java.lang.Integer { !static <fields>; }
+-keepclassmembers class java.lang.Long { !static <fields>; }
+-keepclassmembers class java.lang.Float { !static <fields>; }
+-keepclassmembers class java.lang.Double { !static <fields>; }
+-keepclassmembers class java.lang.ref.Reference { !static <fields>; }
+-keepclassmembers class java.lang.ref.ReferenceQueue { !static <fields>; }
+-keepclassmembers class java.lang.ref.WeakReference { !static <fields>; }
+-keepclassmembers class java.lang.ref.PhantomReference { !static <fields>; }
+-keepclassmembers class java.lang.reflect.Field { !static <fields>; }
+-keepclassmembers class java.lang.reflect.Method { !static <fields>; }
 
 # ClassLoader.getSystemClassloader() depends on the existence of this class: