diff --git a/Android.libv8.mk b/Android.libv8.mk
index ada8904..ecaf762 100644
--- a/Android.libv8.mk
+++ b/Android.libv8.mk
@@ -64,7 +64,8 @@
 	-Wno-endif-labels \
 	-Wno-import \
 	-Wno-format \
-	-fno-exceptions
+	-fno-exceptions \
+	-DENABLE_DEBUGGER_SUPPORT
 
 ifeq ($(TARGET_ARCH),arm)
 	LOCAL_CFLAGS += -DARM -DV8_TARGET_ARCH_ARM
diff --git a/Android.mksnapshot.mk b/Android.mksnapshot.mk
index bcb7698..1521eae 100644
--- a/Android.mksnapshot.mk
+++ b/Android.mksnapshot.mk
@@ -55,7 +55,8 @@
 	-Wno-import \
 	-Wno-format \
 	-ansi \
-	-fno-rtti
+	-fno-rtti \
+	-DENABLE_DEBUGGER_SUPPORT
 
 ifeq ($(TARGET_ARCH),arm)
   LOCAL_CFLAGS += -DV8_TARGET_ARCH_ARM
@@ -65,6 +66,10 @@
   LOCAL_CFLAGS += -DV8_TARGET_ARCH_IA32
 endif
 
+ifeq ($(DEBUG_V8),true)
+	LOCAL_CFLAGS += -DDEBUG -UNDEBUG
+endif
+
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/src
 
 # This is on host.
diff --git a/Android.v8common.mk b/Android.v8common.mk
index 06e397e..6d8034b 100644
--- a/Android.v8common.mk
+++ b/Android.v8common.mk
@@ -134,4 +134,6 @@
 	src/date.js \
 	src/regexp.js \
 	src/json.js \
+	src/mirror-debugger.js \
+	src/debug-debugger.js \
 	src/macros.py