Fix 64-bit clearsilver shared library issueandroid-sdk-tools_r7android-adt-0.9.8

Change-Id: Ia5524362f038e0f08fd7d24e6ffe4a60f640cb30

6 files changed, 31 insertions, 29 deletions

diff --git a/Android.mk b/Android.mk
index 5053e7d..77d17ab 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1 +1,4 @@
+# TODO: remove this and all checks once we suport java6 only.
+java_version := $(shell java -version 2>&1 | head -n 1 | sed -e 's/[^0-9\._]//g')
+
 include $(call all-subdir-makefiles)
diff --git a/CleanSpec.mk b/CleanSpec.mk
index b84e1b6..c464a04 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -47,3 +47,7 @@
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
+$(call add-clean-step, rm -rf $(HOST_OUT)/obj/SHARED_LIBRARIES/libneo_cs_intermediates)
+$(call add-clean-step, rm -rf $(HOST_OUT)/obj/SHARED_LIBRARIES/libneo_cgi_intermediates)
+$(call add-clean-step, rm -rf $(HOST_OUT)/obj/SHARED_LIBRARIES/libneo_util_intermediates)
+$(call add-clean-step, rm -rf $(HOST_OUT)/obj/SHARED_LIBRARIES/libclearsilver-jni_intermediates)
diff --git a/cgi/Android.mk b/cgi/Android.mk
index 46409f6..f954473 100644
--- a/cgi/Android.mk
+++ b/cgi/Android.mk
@@ -12,6 +12,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_cgi
@@ -21,10 +27,3 @@ LOCAL_SHARED_LIBRARIES := libneo_util libneo_cs
 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:=
-$(LOCAL_BUILT_MODULE): HOST_GLOBAL_LDFLAGS:=
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:=
diff --git a/java-jni/Android.mk b/java-jni/Android.mk
index ef83dca..7e1edf0 100644
--- a/java-jni/Android.mk
+++ b/java-jni/Android.mk
@@ -33,6 +33,12 @@ LOCAL_C_INCLUDES := \
 
 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
 
 ifeq ($(HOST_OS),darwin)
@@ -69,11 +75,3 @@ $(GEN): PRIVATE_MODULE := $(LOCAL_MODULE)
 $(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:=
-$(LOCAL_BUILT_MODULE): HOST_GLOBAL_LDFLAGS:=
-
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:=