Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 344742b0 authored by Ken Wakasa's avatar Ken Wakasa
Browse files

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
parent ce2ac1c8

tools/Android.mk

+1 −3
Original line number Diff line number Diff line
@@ -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)

tools/dicttool/Android.mk

+8 −0
Original line number Diff line number Diff line
@@ -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 :=

tools/dicttool/NativeLib.mk

+8 −0
Original line number Diff line number Diff line
@@ -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 :=