diff options
| author | Ying Wang <wangying@google.com> | 2010-06-14 16:25:24 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-06-14 17:38:32 -0700 |
| commit | df54557c3fd46b9c96c3471da2a75487a8fdc2dc (patch) | |
| tree | c3b94c8d27b08dc31a142d810ed4eb0b1c2583d8 /cs | |
| parent | 07dd92d42a6c10f06a25a5b021accd8848a8e029 (diff) | |
| download | clearsilver-df54557c3fd46b9c96c3471da2a75487a8fdc2dc.tar.gz | |
Fix 64-bit clearsilver shared library issue
Change-Id: Ia5524362f038e0f08fd7d24e6ffe4a60f640cb30
Diffstat (limited to 'cs')
| -rw-r--r-- | cs/Android.mk | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/cs/Android.mk b/cs/Android.mk index ca79501..12eef22 100644 --- a/cs/Android.mk +++ b/cs/Android.mk @@ -8,6 +8,12 @@ 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_cs @@ -15,10 +21,3 @@ LOCAL_MODULE:= libneo_cs LOCAL_SHARED_LIBRARIES := 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:= |