diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-03-06 22:16:27 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-03-06 22:16:27 -0800 |
| commit | 0751495921acc3736868d41fd4522789f37c64fc (patch) | |
| tree | cb930fc6d20d7b48669ccd78efc1fc1e3989830c | |
| parent | 3ee2196cfb7c49a974b5e3e1637f0d9b9b2c28c6 (diff) | |
| parent | 2bebda2fa798f4c25239ccb2046c6181d393be99 (diff) | |
| download | latinime-0751495921acc3736868d41fd4522789f37c64fc.tar.gz latinime-0751495921acc3736868d41fd4522789f37c64fc.tar.xz latinime-0751495921acc3736868d41fd4522789f37c64fc.zip | |
am 2bebda2f: Merge "Recover the dicttool build except for Mac"
* commit '2bebda2fa798f4c25239ccb2046c6181d393be99':
Recover the dicttool build except for Mac
| -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 := |