From df54557c3fd46b9c96c3471da2a75487a8fdc2dc Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Mon, 14 Jun 2010 16:25:24 -0700
Subject: Fix 64-bit clearsilver shared library issue

Change-Id: Ia5524362f038e0f08fd7d24e6ffe4a60f640cb30
---
 util/Android.mk | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'util')

diff --git a/util/Android.mk b/util/Android.mk
index 02a78d7..e4e5e84 100644
--- a/util/Android.mk
+++ b/util/Android.mk
@@ -17,15 +17,14 @@ LOCAL_SRC_FILES:= \
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 LOCAL_CFLAGS := -fPIC
 
+# This forces a 64-bit build for Java6
+ifneq ($(filter 1.6%,$(java_version)),)
+    LOCAL_CFLAGS += -m64
+    LOCAL_LDFLAGS += -m64
+endif
+
 LOCAL_NO_DEFAULT_COMPILER_FLAGS := true
 
 LOCAL_MODULE:= libneo_util
 
 include $(BUILD_HOST_SHARED_LIBRARY)
-
-# this forces us into 64 bit mode, even though for the non-simulator builds we
-# mostly don't do that.  Java on Hardy is 64 bit, and rather than finding a 32
-# bit java build, just build this in 64 bit.
-$(LOCAL_BUILT_MODULE): HOST_GLOBAL_CFLAGS:=
-$(LOCAL_BUILT_MODULE): HOST_GLOBAL_CPPFLAGS:=
-$(LOCAL_BUILT_MODULE): HOST_GLOBAL_LDFLAGS:=
-- 
cgit v1.2.3