diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:04:10 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:04:10 -0800 |
| commit | b651aeec8a719c9f639ef710423e29463123d4f6 (patch) | |
| tree | 42d1734c13a3787d1c34ed5fa63b391007966ed7 | |
| parent | 5287bd68df69562fb14b988db841dd45b549e328 (diff) | |
| download | clearsilver-b651aeec8a719c9f639ef710423e29463123d4f6.tar.gz | |
Code drop from //branches/cupcake/...@124589
| -rw-r--r-- | cgi/Android.mk | 3 | ||||
| -rw-r--r-- | cs/Android.mk | 3 | ||||
| -rw-r--r-- | java-jni/Android.mk | 5 | ||||
| -rw-r--r-- | util/Android.mk | 3 |
4 files changed, 13 insertions, 1 deletions
diff --git a/cgi/Android.mk b/cgi/Android.mk index 291ae94..3145015 100644 --- a/cgi/Android.mk +++ b/cgi/Android.mk @@ -24,5 +24,8 @@ LOCAL_LDLIBS += -lz 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:= diff --git a/cs/Android.mk b/cs/Android.mk index 778bbd4..885a246 100644 --- a/cs/Android.mk +++ b/cs/Android.mk @@ -18,5 +18,8 @@ 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:= diff --git a/java-jni/Android.mk b/java-jni/Android.mk index d8a65ff..3b5f876 100644 --- a/java-jni/Android.mk +++ b/java-jni/Android.mk @@ -33,7 +33,7 @@ LOCAL_SRC_FILES:= \ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/.. -LOCAL_CFLAGS := -fPIC +LOCAL_CFLAGS += -fPIC LOCAL_NO_DEFAULT_COMPILER_FLAGS := true @@ -72,5 +72,8 @@ $(GEN): $(our_java_lib) $(transform-generated-source) $(intermediates)/j_neo_cs.o : $(GEN) +# 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:= diff --git a/util/Android.mk b/util/Android.mk index a2ff274..8ad4184 100644 --- a/util/Android.mk +++ b/util/Android.mk @@ -24,5 +24,8 @@ 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:= |