diff options
| author |   Dan Willemsen <dwillemsen@google.com> | 2017-07-26 20:42:35 +0000 |
|---|---|---|
| committer |   android-build-merger <android-build-merger@google.com> | 2017-07-26 20:42:35 +0000 |
| commit | 5977a3cb1839d8c3cd1be37de01765f27234b6dd (patch) | |
| tree | a3f5b4c14543a7d1c94812c88725fee2af3e1132 /tools | |
| parent | dec3c3d02b233af7a15a25406e0961231494bc60 (diff) | |
| parent | 3669fbc4c907f7805f73a0f7c9fdd86c000c3ba6 (diff) | |
| download | latinime-5977a3cb1839d8c3cd1be37de01765f27234b6dd.tar.gz latinime-5977a3cb1839d8c3cd1be37de01765f27234b6dd.tar.xz latinime-5977a3cb1839d8c3cd1be37de01765f27234b6dd.zip | |
Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION"
am: 3669fbc4c9
Change-Id: Ibfbc1f11eac0870a5eec7211c868fdcb38f395e0
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dicttool/Android.mk | 9 | ||||
| -rw-r--r-- | tools/dicttool/NativeLib.mk | 10 |
2 files changed, 0 insertions, 19 deletions
diff --git a/tools/dicttool/Android.mk b/tools/dicttool/Android.mk index 6852b82b4..49816294f 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 @@ LOCAL_MODULE := dicttool_aosp 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 622a9f171..510f18c4e 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 @@ ifeq ($(FLAG_DBG), true) 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 @@ LOCAL_MODULE := $(LATINIME_HOST_NATIVE_LIBNAME) 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 := |