diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-06-01 14:14:03 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2011-06-01 14:14:05 -0700 |
| commit | 3643c656d6e3f0fb7c340779d25232a0b76d0af3 (patch) | |
| tree | 6e464a2c0ca1d011ce9385898101276e0744826e | |
| parent | 4e7d837c51b575cdfc267e399159ebf185cefe2b (diff) | |
| parent | 3e15867df7fb41770c090ee40411a6c376574ae3 (diff) | |
| download | clearsilver-3643c656d6e3f0fb7c340779d25232a0b76d0af3.tar.gz | |
Merge from gingerbread
Change-Id: I4a71e1392d781243dbd0814fedc7cd598c8e156d
| -rw-r--r-- | cgi/Android.mk | 3 | ||||
| -rw-r--r-- | cs/Android.mk | 3 | ||||
| -rw-r--r-- | java-jni/Android.mk | 3 | ||||
| -rw-r--r-- | util/Android.mk | 3 |
4 files changed, 8 insertions, 4 deletions
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_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) 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_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) 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) 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_SRC_FILES:= \ 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) |