commit 3256166df40981f1f1997a5f00303712277c963f
author Mathieu Chartier <mathieuc@google.com> Fri Sep 12 12:58:05 2014 -0700
committer Mathieu Chartier <mathieuc@google.com> Sun Sep 14 13:53:46 2014 -0700
tree 09b828c1e4447dc369e2f0b65c8e240213d40554
parent afa6b8e93a0dc0de33c9d404945c7c5621e20b1a

Add native support for FinalizerList.makeCircularListIfUnenqueued

Called from FinalizerReference.enqueueSentinelReference to prevent
a race where the GC updates pendingNext of the sentinel reference
before enqueueSentinelReference.

Bug: 17462553

Change-Id: I7ad2fd250c2715d1aeb919bd548ef9aab24f30a2

runtime/Android.mk

diff --git a/runtime/Android.mk b/runtime/Android.mk
index 0ab6626..17ee8ab 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -118,6 +118,7 @@
   native/java_lang_Thread.cc \
   native/java_lang_Throwable.cc \
   native/java_lang_VMClassLoader.cc \
+  native/java_lang_ref_FinalizerReference.cc \
   native/java_lang_ref_Reference.cc \
   native/java_lang_reflect_Array.cc \
   native/java_lang_reflect_Constructor.cc \