diff options
| author |   Dan Willemsen <dwillemsen@google.com> | 2017-07-26 00:43:33 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-07-26 10:59:15 -0700 |
| commit | 6e29475b9ff8a832c6c08cf8c52fac93a378957b (patch) | |
| tree | cfa647f977b268f91c8c59d2b787ba6258bc5f20 /tools/dicttool/NativeLib.mk | |
| parent | bde4c9a8dfa85ca71f034c371908358bf61a74f2 (diff) | |
| download | latinime-6e29475b9ff8a832c6c08cf8c52fac93a378957b.tar.gz latinime-6e29475b9ff8a832c6c08cf8c52fac93a378957b.tar.xz latinime-6e29475b9ff8a832c6c08cf8c52fac93a378957b.zip | |
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
Diffstat (limited to 'tools/dicttool/NativeLib.mk')
| -rw-r--r-- | tools/dicttool/NativeLib.mk | 10 |
1 files changed, 0 insertions, 10 deletions
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 := |