Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION
This builds on Darwin fine, so remove the non-standard darwin checks.
Remove HOST_JDK_IS_64BIT_VERSION, it's always true now, and this is the
only user.
Test: mmm packages/inputmethods/LatinIME/tools/dicttool:liblatinime-aosp-dicttool-host
Change-Id: I750c6baa29cf1d27a885ff064f0daf9d986db0b9
diff --git a/tools/dicttool/Android.mk b/tools/dicttool/Android.mk
index 6852b82..4981629 100644
--- a/tools/dicttool/Android.mk
+++ b/tools/dicttool/Android.mk
@@ -16,12 +16,6 @@
# Only build if it's explicitly requested, or running mm/mmm.
ifneq ($(ONE_SHOT_MAKEFILE)$(filter $(MAKECMDGOALS),dicttool_aosp),)
-# HACK: Temporarily disable host tool build on Mac until the build system is ready for C++11.
-LATINIME_HOST_OSNAME := $(shell uname -s)
-ifeq ($(LATINIME_HOST_OSNAME), Darwin) # TODO: Remove this
-$(warning dicttool_aosp is not supported on $(LATINIME_HOST_OSNAME))
-else # TODO: Remove this
-
LATINIME_DICTTOOL_AOSP_LOCAL_PATH := $(call my-dir)
LOCAL_PATH := $(LATINIME_DICTTOOL_AOSP_LOCAL_PATH)
LATINIME_HOST_NATIVE_LIBNAME := liblatinime-aosp-dicttool-host
@@ -86,11 +80,8 @@
include $(BUILD_HOST_JAVA_LIBRARY)
include $(LOCAL_PATH)/etc/Android.mk
-endif # Darwin - TODO: Remove this
-
# Clear our private variables
LATINIME_DICTTOOL_AOSP_LOCAL_PATH :=
LATINIME_LOCAL_DIR :=
-LATINIME_HOST_OSNAME :=
endif
diff --git a/tools/dicttool/NativeLib.mk b/tools/dicttool/NativeLib.mk
index 622a9f1..510f18c 100644
--- a/tools/dicttool/NativeLib.mk
+++ b/tools/dicttool/NativeLib.mk
@@ -13,10 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# HACK: Temporarily disable host tool build on Mac until the build system is ready for C++11.
-LATINIME_HOST_OSNAME := $(shell uname -s)
-ifneq ($(LATINIME_HOST_OSNAME), Darwin) # TODO: Remove this
-
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
@@ -30,9 +26,6 @@
endif #FLAG_DBG
LOCAL_CFLAGS += -DHOST_TOOL -fPIC -Wno-deprecated -Wno-unused-parameter -Wno-unused-function
-ifneq ($(strip $(HOST_JDK_IS_64BIT_VERSION)),)
-LOCAL_MULTILIB := 64
-endif #HOST_JDK_IS_64BIT_VERSION
LATINIME_NATIVE_JNI_DIR := $(LATINIME_DIR_RELATIVE_TO_DICTTOOL)/native/jni
LATINIME_NATIVE_SRC_DIR := $(LATINIME_DIR_RELATIVE_TO_DICTTOOL)/native/jni/src
@@ -48,9 +41,6 @@
include $(BUILD_HOST_SHARED_LIBRARY)
-endif # Darwin - TODO: Remove this
-
# Clear our private variables
include $(LOCAL_PATH)/$(LATINIME_NATIVE_JNI_DIR)/CleanupNativeFileList.mk
LATINIME_DIR_RELATIVE_TO_DICTTOOL := ../..
-LATINIME_HOST_OSNAME :=