diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-03-07 12:37:40 +0900 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2014-03-07 15:04:27 +0900 |
| commit | 344742b0d1bd592c648db83d7e49137866305bba (patch) | |
| tree | aed52e25c8cc6a4069d83bbe5d84d6afa50708df | |
| parent | ce2ac1c835e9794dde41fe14e4e953177c8333cc (diff) | |
| download | latinime-344742b0d1bd592c648db83d7e49137866305bba.tar.gz latinime-344742b0d1bd592c648db83d7e49137866305bba.tar.xz latinime-344742b0d1bd592c648db83d7e49137866305bba.zip | |
Recover the dicttool build except for Mac
With a hack: Temporarily disable host tool build on Mac until the
build system is ready for C++11.
Change-Id: Ib412ba0d7fecc968cc09b4d8fde4e838bdc0618a
| -rw-r--r-- | tools/Android.mk | 4 | ||||
| -rw-r--r-- | tools/dicttool/Android.mk | 8 | ||||
| -rw-r--r-- | tools/dicttool/NativeLib.mk | 8 |
3 files changed, 17 insertions, 3 deletions
diff --git a/tools/Android.mk b/tools/Android.mk index dc1403337..91b2fbbb0 100644 --- a/tools/Android.mk +++ b/tools/Android.mk @@ -12,6 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Temporarily excluding dicttool -#include $(call all-subdir-makefiles) -include $(call all-named-subdir-makefiles, make-keyboard-text) +include $(call all-subdir-makefiles) diff --git a/tools/dicttool/Android.mk b/tools/dicttool/Android.mk index b1dd7f653..c0a55626a 100644 --- a/tools/dicttool/Android.mk +++ b/tools/dicttool/Android.mk @@ -13,6 +13,10 @@ # 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 + LATINIME_DICTTOOL_AOSP_LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(LATINIME_DICTTOOL_AOSP_LOCAL_PATH) LATINIME_HOST_NATIVE_LIBNAME := liblatinime-aosp-dicttool-host @@ -74,10 +78,14 @@ LOCAL_JAVA_LIBRARIES := junit LOCAL_ADDITIONAL_DEPENDENCIES := $(LATINIME_HOST_NATIVE_LIBNAME) LOCAL_JAR_MANIFEST := etc/manifest.txt LOCAL_MODULE := dicttool_aosp +LOCAL_IS_HOST_MODULE := true 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 := diff --git a/tools/dicttool/NativeLib.mk b/tools/dicttool/NativeLib.mk index 26b677447..95f767dc9 100644 --- a/tools/dicttool/NativeLib.mk +++ b/tools/dicttool/NativeLib.mk @@ -13,6 +13,10 @@ # 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) @@ -49,9 +53,13 @@ LOCAL_SRC_FILES := \ $(addprefix $(LATINIME_NATIVE_SRC_DIR)/, $(LATIN_IME_CORE_SRC_FILES)) LOCAL_MODULE := $(LATINIME_HOST_NATIVE_LIBNAME) +LOCAL_IS_HOST_MODULE := true 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 := |