diff options
author | Ying Wang <wangying@google.com> | 2010-07-09 13:31:57 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-09 13:31:57 -0700 |
commit | 11a4773bb2459eb7adb84163bc21d8438cd085bd (patch) | |
tree | 3d1dcc1a14b9fbcc03f3577831cd36193362f284 | |
parent | 70828f50c0e34fd2a06d640c102464f951fa1e53 (diff) | |
parent | 842a260610794dbd970cc770784f9aa0ccb2f2e6 (diff) | |
download | clearsilver-11a4773bb2459eb7adb84163bc21d8438cd085bd.tar.gz |
am 842a2606: Remove unnecessary java version check
Merge commit '842a260610794dbd970cc770784f9aa0ccb2f2e6' into gingerbread-plus-aosp
* commit '842a260610794dbd970cc770784f9aa0ccb2f2e6':
Remove unnecessary java version check
-rw-r--r-- | Android.mk | 3 | ||||
-rw-r--r-- | cgi/Android.mk | 6 | ||||
-rw-r--r-- | cs/Android.mk | 6 | ||||
-rw-r--r-- | java-jni/Android.mk | 6 | ||||
-rw-r--r-- | util/Android.mk | 6 |
5 files changed, 8 insertions, 19 deletions
@@ -1,4 +1 @@ -# 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/cgi/Android.mk b/cgi/Android.mk index f954473..21c534b 100644 --- a/cgi/Android.mk +++ b/cgi/Android.mk @@ -13,10 +13,8 @@ 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_CFLAGS += -m64 +LOCAL_LDFLAGS += -m64 LOCAL_NO_DEFAULT_COMPILER_FLAGS := true diff --git a/cs/Android.mk b/cs/Android.mk index 12eef22..9f0e30a 100644 --- a/cs/Android.mk +++ b/cs/Android.mk @@ -9,10 +9,8 @@ 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_CFLAGS += -m64 +LOCAL_LDFLAGS += -m64 LOCAL_NO_DEFAULT_COMPILER_FLAGS := true diff --git a/java-jni/Android.mk b/java-jni/Android.mk index 7e1edf0..21b4fd1 100644 --- a/java-jni/Android.mk +++ b/java-jni/Android.mk @@ -34,10 +34,8 @@ 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_CFLAGS += -m64 +LOCAL_LDFLAGS += -m64 LOCAL_NO_DEFAULT_COMPILER_FLAGS := true diff --git a/util/Android.mk b/util/Android.mk index e4e5e84..386f379 100644 --- a/util/Android.mk +++ b/util/Android.mk @@ -18,10 +18,8 @@ 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_CFLAGS += -m64 +LOCAL_LDFLAGS += -m64 LOCAL_NO_DEFAULT_COMPILER_FLAGS := true |