commit a5a53efea976af505f4f849b5925d5e14c4f8e5c
author Mathieu Chartier <mathieuc@google.com> Fri Sep 12 12:58:05 2014 -0700
committer Mathieu Chartier <mathieuc@google.com> Sun Sep 14 14:48:24 2014 -0700
tree 455a536a9394908c17ec1ede04ab7ec49f9d3420
parent 91bbd5347b391278b56440b2dbb0b77526bae4e8

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

(cherry picked from commit 3256166df40981f1f1997a5f00303712277c963f)

Change-Id: I7ad2fd250c2715d1aeb919bd548ef9aab24f30a2

runtime/Android.mk

diff --git a/runtime/Android.mk b/runtime/Android.mk
index 5065c58..61bc9ff 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -120,6 +120,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 \