diff --git a/Android/jni/testdisplay b/Android/jni/testdisplay
new file mode 120000
index 00000000..c07a74de
--- /dev/null
+++ b/Android/jni/testdisplay
@@ -0,0 +1 @@
+build.sh
\ No newline at end of file
diff --git a/Android/jni/testdisplay.mk b/Android/jni/testdisplay.mk
new file mode 100644
index 00000000..f23e67ff
--- /dev/null
+++ b/Android/jni/testdisplay.mk
@@ -0,0 +1,32 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+PACKAGE_IDENTIFIER := "org.deadc0de.apple2"
+PACKAGE_NAME := "apple2ix"
+COMMON_SOURCES_MK := $(LOCAL_PATH)/sources.mk
+include $(COMMON_SOURCES_MK)
+
+# -----------------------------------------------------------------------------
+# Android build config
+
+LOCAL_MODULE    := libapple2ix
+LOCAL_SRC_FILES := jnihooks.c $(APPLE2_SRC_PATH)/test/testcommon.c $(APPLE2_SRC_PATH)/test/testdisplay.c
+LOCAL_CFLAGS    := $(APPLE2_BASE_CFLAGS) -DTEST_DISPLAY -DTESTING=1
+LOCAL_LDLIBS    := -llog -landroid -lGLESv2 -lz
+
+# Add assembly files first ... mostly for the benefit of the ARM assembler ...
+ifeq ($(TARGET_ARCH_ABI),x86)
+    LOCAL_SRC_FILES += $(APPLE2_X86_SRC)
+else
+    LOCAL_SRC_FILES += $(APPLE2_ARM_SRC)
+endif
+
+LOCAL_SRC_FILES += $(APPLE2_MAIN_SRC) $(APPLE2_META_SRC) $(APPLE2_VIDEO_SRC)
+
+# Build a shared library and let Java/Dalvik drive
+include $(BUILD_SHARED_LIBRARY)
+
+# --OR-- Build an executable so native can drive this show
+#include $(BUILD_EXECUTABLE)
+
diff --git a/Android/jni/testvm b/Android/jni/testvm
new file mode 120000
index 00000000..c07a74de
--- /dev/null
+++ b/Android/jni/testvm
@@ -0,0 +1 @@
+build.sh
\ No newline at end of file
diff --git a/Android/jni/testvm.mk b/Android/jni/testvm.mk
new file mode 100644
index 00000000..6169e16b
--- /dev/null
+++ b/Android/jni/testvm.mk
@@ -0,0 +1,32 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+PACKAGE_IDENTIFIER := "org.deadc0de.apple2"
+PACKAGE_NAME := "apple2ix"
+COMMON_SOURCES_MK := $(LOCAL_PATH)/sources.mk
+include $(COMMON_SOURCES_MK)
+
+# -----------------------------------------------------------------------------
+# Android build config
+
+LOCAL_MODULE    := libapple2ix
+LOCAL_SRC_FILES := jnihooks.c $(APPLE2_SRC_PATH)/test/testcommon.c $(APPLE2_SRC_PATH)/test/testvm.c
+LOCAL_CFLAGS    := $(APPLE2_BASE_CFLAGS) -DTEST_VM -DTESTING=1 -DCPU_TRACING=1 -DDISK_TRACING=1 -DVM_TRACING=1
+LOCAL_LDLIBS    := -llog -landroid -lGLESv2 -lz
+
+# Add assembly files first ... mostly for the benefit of the ARM assembler ...
+ifeq ($(TARGET_ARCH_ABI),x86)
+    LOCAL_SRC_FILES += $(APPLE2_X86_SRC)
+else
+    LOCAL_SRC_FILES += $(APPLE2_ARM_SRC)
+endif
+
+LOCAL_SRC_FILES += $(APPLE2_MAIN_SRC) $(APPLE2_META_SRC) $(APPLE2_VIDEO_SRC)
+
+# Build a shared library and let Java/Dalvik drive
+include $(BUILD_SHARED_LIBRARY)
+
+# --OR-- Build an executable so native can drive this show
+#include $(BUILD_EXECUTABLE)
+