summaryrefslogtreecommitdiffstats
path: root/vm/Dalvik.h
diff options
context:
space:
mode:
authorBarry Hayes <bhayes@google.com>2010-06-25 13:36:37 -0700
committerBarry Hayes <bhayes@google.com>2010-06-25 13:36:37 -0700
commit7ef0755c91caeea2cc89d886e566e71dc626abed (patch)
treee99cdaf86d56fdaf4bbeb4a89a5644238508648e /vm/Dalvik.h
parentc6b25c79a4ec5cc83e2bc14af24e8eabad931743 (diff)
downloadandroid_dalvik-7ef0755c91caeea2cc89d886e566e71dc626abed.tar.gz
android_dalvik-7ef0755c91caeea2cc89d886e566e71dc626abed.tar.bz2
android_dalvik-7ef0755c91caeea2cc89d886e566e71dc626abed.zip
Move WriteBarrier operations into their own header file. Split Object.h
The write barrier routines will soon be INLINE and non-null. Buried in the middle of Object.h, which is early in Dalvik.h, it would be hard for them to make use of definitions in other .h files. Change-Id: I3c0eb59cb6ef29c2bacd0432cf59aaca4c3d031c
Diffstat (limited to 'vm/Dalvik.h')
-rw-r--r--vm/Dalvik.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/vm/Dalvik.h b/vm/Dalvik.h
index 27fa31664..5d8444047 100644
--- a/vm/Dalvik.h
+++ b/vm/Dalvik.h
@@ -58,6 +58,7 @@
#include "alloc/HeapDebug.h"
#include "alloc/HeapWorker.h"
#include "alloc/GC.h"
+#include "alloc/WriteBarrier.h"
#include "oo/AccessCheck.h"
#include "JarFile.h"
#include "Properties.h"
@@ -83,5 +84,6 @@
#include "Atomic.h"
#include "interp/Interp.h"
#include "InlineNative.h"
+#include "oo/ObjectInlines.h"
#endif /*_DALVIK_DALVIK*/