aboutsummaryrefslogtreecommitdiff
path: root/java-jni/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'java-jni/Android.mk')
-rw-r--r--java-jni/Android.mk3
1 files changed, 2 insertions, 1 deletions
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_C_INCLUDES := \
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)