commit 14c3bf91b2ec434295ec84d6446f495fb7de6d5c
author Mathieu Chartier <mathieuc@google.com> Mon Jul 13 14:35:43 2015 -0700
committer Mathieu Chartier <mathieuc@google.com> Fri Jul 17 15:34:40 2015 -0700
tree 6eaa51c263b84b7a11f40f21be993987cdca80f3
parent 6d3d1e3d866a880b4df95ba96ed126c1723e3dd6

Change intern table to not use WaitHoldingLocks

Bug: 22423014
Change-Id: I9e16b8cb4def72fff73f1783a182877105feb7aa

runtime/Android.mk

diff --git a/runtime/Android.mk b/runtime/Android.mk
index 7f103a4..dd1613e 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -311,13 +311,14 @@
   dex_instruction.h \
   dex_instruction_utils.h \
   gc_root.h \
-  gc/allocator/rosalloc.h \
-  gc/collector/gc_type.h \
   gc/allocator_type.h \
+  gc/allocator/rosalloc.h \
   gc/collector_type.h \
+  gc/collector/gc_type.h \
+  gc/heap.h \
   gc/space/region_space.h \
   gc/space/space.h \
-  gc/heap.h \
+  gc/weak_root_state.h \
   image.h \
   instrumentation.h \
   indirect_reference_table.h \