Mark non-image spaces and use write barrier for image spaces.
Don't mark string and class roots that are in the image, alloc space
references will be caught by the write barrier.
Change-Id: Idcf9e4ede3b83556d4f8a01276273726dc6eea46
diff --git a/src/compiler/Dalvik.h b/src/compiler/Dalvik.h
index 422e20c0..73a9d7a 100644
--- a/src/compiler/Dalvik.h
+++ b/src/compiler/Dalvik.h
@@ -25,6 +25,7 @@
#include <stdint.h>
#include <stdio.h>
+#include "card_table.h"
#include "class_linker.h"
#include "compiler.h"
#include "dex_cache.h"
@@ -65,9 +66,6 @@
typedef art::String String;
typedef art::Thread Thread;
-// From alloc/CardTable.h
-#define GC_CARD_SHIFT 7
-
// use to switch visibility on DCHECK tracebacks
#if 1
#define STATIC