diff --git a/Android.mk b/Android.mk
index 68a8c43..d93784e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -99,6 +99,10 @@
     $(x86_path)/regs.c \
     $(x86_path)/trace.c \
 
+# x86_64 uses the same source as x86.
+LOCAL_C_INCLUDES_x86_64 := $(LOCAL_C_INCLUDES_x86)
+LOCAL_SRC_FILES_x86_64 := $(LOCAL_SRC_FILES_x86)
+
 LOCAL_CFLAGS := -D_GNU_SOURCE=1 -D_POSIX_SOURCE=1
 
 LOCAL_CFLAGS += \
@@ -184,7 +188,7 @@
 
 LOCAL_MODULE_TAGS := debug
 
-LOCAL_MODULE_TARGET_ARCH := arm arm64
+LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 x86_64
 
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk