diff --git a/cgi/Android.mk b/cgi/Android.mk
index 071c9c4..d0125b3 100644
--- a/cgi/Android.mk
+++ b/cgi/Android.mk
@@ -12,9 +12,10 @@
 
 LOCAL_CFLAGS := -fPIC
 
-# This forces a 64-bit build for Java6
+ifeq ($(HOST_JDK_IS_64BIT_VERSION),true)
 LOCAL_CFLAGS += -m64
 LOCAL_LDFLAGS += -m64
+endif
 # We use the host compilers because the Linux SDK build
 # uses a 32-bit toolchain that can't handle -m64
 LOCAL_CC := $(CC)
diff --git a/cs/Android.mk b/cs/Android.mk
index 51f2bb1..e621fcd 100644
--- a/cs/Android.mk
+++ b/cs/Android.mk
@@ -8,9 +8,10 @@
 
 LOCAL_CFLAGS := -fPIC
 
-# This forces a 64-bit build for Java6
+ifeq ($(HOST_JDK_IS_64BIT_VERSION),true)
 LOCAL_CFLAGS += -m64
 LOCAL_LDFLAGS += -m64
+endif
 # We use the host compilers because the Linux SDK build
 # uses a 32-bit toolchain that can't handle -m64
 LOCAL_CC := $(CC)
diff --git a/java-jni/Android.mk b/java-jni/Android.mk
index 64c3c0f..80a4d9f 100644
--- a/java-jni/Android.mk
+++ b/java-jni/Android.mk
@@ -33,9 +33,10 @@
 
 LOCAL_CFLAGS += -fPIC
 
-# This forces a 64-bit build for Java6
+ifeq ($(HOST_JDK_IS_64BIT_VERSION),true)
 LOCAL_CFLAGS += -m64
 LOCAL_LDFLAGS += -m64
+endif
 # We use the host compilers because the Linux SDK build
 # uses a 32-bit toolchain that can't handle -m64
 LOCAL_CC := $(CC)
diff --git a/util/Android.mk b/util/Android.mk
index 93f24c9..4ccb9a4 100644
--- a/util/Android.mk
+++ b/util/Android.mk
@@ -17,9 +17,10 @@
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 LOCAL_CFLAGS := -fPIC
 
-# This forces a 64-bit build for Java6
+ifeq ($(HOST_JDK_IS_64BIT_VERSION),true)
 LOCAL_CFLAGS += -m64
 LOCAL_LDFLAGS += -m64
+endif
 # We use the host compilers because the Linux SDK build
 # uses a 32-bit toolchain that can't handle -m64
 LOCAL_CC := $(CC)