diff options
| author | Ying Wang <wangying@google.com> | 2010-07-07 18:21:05 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@android.com> | 2010-09-22 10:58:35 -0700 |
| commit | 154dfff8766839d10fbb3311555338f3b9f0c774 (patch) | |
| tree | c57d9ebce3a65b3704f993d49ed13c053cd135d3 | |
| parent | d36910a8110d8377b22301274d2b5131a732a72b (diff) | |
| download | clearsilver-tools_r7.tar.gz | |
Remove unnecessary java version checkandroid-adt-0.9.9tools_r8tools_r7froyo-plus-aosp
Java6 is enforced by the build system now.
Change-Id: I07bad9ac4b8ace81705b1a72eb36eb8578fb99ff
| -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 |